Browse Source

UI: Don't add quick transition if it doesn't exist

jp9000 9 years ago
parent
commit
57054a237f
1 changed files with 10 additions and 6 deletions
  1. 10 6
      obs/window-basic-main-transitions.cpp

+ 10 - 6
obs/window-basic-main-transitions.cpp

@@ -162,14 +162,18 @@ void OBSBasic::LoadQuickTransitions(obs_data_array_t *array)
 
 		if (id) {
 			obs_source_t *source = FindTransition(name);
-			quickTransitions.emplace_back(source, duration, id);
+			if (source) {
+				quickTransitions.emplace_back(source, duration,
+						id);
 
-			if (quickTransitionIdCounter <= id)
-				quickTransitionIdCounter = id + 1;
+				if (quickTransitionIdCounter <= id)
+					quickTransitionIdCounter = id + 1;
 
-			int idx = (int)quickTransitions.size() - 1;
-			AddQuickTransitionHotkey(&quickTransitions[idx]);
-			obs_hotkey_load(quickTransitions[idx].hotkey, hotkeys);
+				int idx = (int)quickTransitions.size() - 1;
+				AddQuickTransitionHotkey(&quickTransitions[idx]);
+				obs_hotkey_load(quickTransitions[idx].hotkey,
+						hotkeys);
+			}
 		}
 
 		obs_data_release(data);