X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_factory.c;h=3045e968b96d4b9fddd333172e5d82299975a232;hb=390e1559353efa011b371b66fcd2c8d3ffb84ab8;hp=1272a8e794400fef5fffab95d8230a04d1ea704e;hpb=8fe450eddce6d6e81cf063af5b471b7ef750efe9;p=melted

diff --git a/src/framework/mlt_factory.c b/src/framework/mlt_factory.c
index 1272a8e..3045e96 100644
--- a/src/framework/mlt_factory.c
+++ b/src/framework/mlt_factory.c
@@ -90,10 +90,6 @@ int mlt_factory_init( const char *prefix )
 
 		// Create the global properties
 		global_properties = mlt_properties_new( );
-		mlt_properties_set_or_default( global_properties, "MLT_NORMALISATION", getenv( "MLT_NORMALISATION" ), "PAL" );
-		mlt_properties_set_or_default( global_properties, "MLT_PRODUCER", getenv( "MLT_PRODUCER" ), "fezzik" );
-		mlt_properties_set_or_default( global_properties, "MLT_CONSUMER", getenv( "MLT_CONSUMER" ), "sdl" );
-		mlt_properties_set( global_properties, "MLT_TEST_CARD", getenv( "MLT_TEST_CARD" ) );
 
 		// Create the object list.
 		object_list = mlt_properties_new( );
@@ -108,6 +104,15 @@ int mlt_factory_init( const char *prefix )
 		atexit( mlt_factory_close );
 	}
 
+	// Allow property refresh on a subsequent initialisation
+	if ( global_properties != NULL )
+	{
+		mlt_properties_set_or_default( global_properties, "MLT_NORMALISATION", getenv( "MLT_NORMALISATION" ), "PAL" );
+		mlt_properties_set_or_default( global_properties, "MLT_PRODUCER", getenv( "MLT_PRODUCER" ), "fezzik" );
+		mlt_properties_set_or_default( global_properties, "MLT_CONSUMER", getenv( "MLT_CONSUMER" ), "sdl" );
+		mlt_properties_set( global_properties, "MLT_TEST_CARD", getenv( "MLT_TEST_CARD" ) );
+	}
+
 	return 0;
 }