fix source transition initialization

exeldro · Apr 23, 2020 · 3714010 · 3714010
1 parent 7cae03f
commit 3714010
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/move-transition.c b/move-transition.c
@@ -900,11 +900,15 @@ bool render2_item(struct move_info *move, struct move_item *item)
 			gs_matrix_translate3f(-(float)crop.left,
 					      -(float)crop.top, 0.0f);
 
-			if (item->transition && !move->start_init) {
+			if (item->transition) {
 				obs_transition_set_manual_time(item->transition,
 							       ot);
-
-				obs_source_video_render(item->transition);
+				if (!move->start_init) {
+					obs_source_video_render(
+						item->transition);
+				} else if (item->item_a) {
+					obs_source_video_render(source);
+				}
 			} else {
 				obs_source_video_render(source);
 			}
@@ -1880,7 +1884,7 @@ MODULE_EXPORT const char *obs_module_description(void)
 	return obs_module_text("Description");
 }
 
-struct obs_source_info move_transition_override_filter;
+extern struct obs_source_info move_transition_override_filter;
 
 bool obs_module_load(void)
 {

diff --git a/move-transition.rc b/move-transition.rc
@@ -1,6 +1,6 @@
 1 VERSIONINFO
- FILEVERSION 1,1,2,0
- PRODUCTVERSION 1,1,2,0
+ FILEVERSION 1,1,3,0
+ PRODUCTVERSION 1,1,3,0
  FILEFLAGSMASK 0x0L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -17,12 +17,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Exeldro"
             VALUE "FileDescription", "Move transition"
-            VALUE "FileVersion", "1.1.2"
+            VALUE "FileVersion", "1.1.3"
             VALUE "InternalName", "move-transition"
             VALUE "LegalCopyright", "(C) Exeldro"
             VALUE "OriginalFilename", "move-transition"
             VALUE "ProductName", "Move transition"
-            VALUE "ProductVersion", "1.1.2"
+            VALUE "ProductVersion", "1.1.3"
         END
     END
     BLOCK "VarFileInfo"