X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=2c0ddff46de8ebc2c648ea7296982172cc6268aa;hb=7b05ad287956f8bd00836d9b5fb39f899a5fb641;hp=6e1ecaa912d094629747dbd28d3c122f03237679;hpb=515b84f2ec94c9ba4808ef83710e7965c13b5c4f;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 6e1ecaa9..2c0ddff4 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -297,6 +297,9 @@ MWindow::~MWindow()
 #endif
 	reset_caches();
 	dead_plugins->remove_all_objects();
+// must delete theme before destroying plugindb
+//  theme destructor will be deleted by delete_plugins
+	delete theme;           theme = 0;
 	delete_plugins();
 	finit_error();
 	keyframe_threads->remove_all_objects();
@@ -325,7 +328,6 @@ MWindow::~MWindow()
 	delete defaults;        defaults = 0;
 	delete assets;          assets = 0;
 	delete splash_window;   splash_window = 0;
-//	delete theme;           theme = 0;	// deleted by delete_plugins
 	if( !edl->Garbage::remove_user() ) edl = 0;
 	delete channeldb_buz;
 	delete channeldb_v4l2jpeg;
@@ -733,14 +735,14 @@ void MWindow::add_plugins(ArrayList<PluginServer*> &plugins)
 	plugins.remove_all();
 }
 
-void MWindow::init_plugin_tips(ArrayList<PluginServer*> &plugins)
+void MWindow::init_plugin_tips(ArrayList<PluginServer*> &plugins, const char *lang)
 {
 	const char *cfg_path = File::get_cindat_path();
 	char msg_path[BCTEXTLEN];  int txt = 0;
 	FILE *fp = 0;
 	if( BC_Resources::language[0] ) {
 		snprintf(msg_path, sizeof(msg_path), "%s/info/plugins.%s",
-			cfg_path, BC_Resources::language);
+			cfg_path, lang);
 		fp = fopen(msg_path, "r");
 	}
 	if( !fp ) {
@@ -2007,7 +2009,7 @@ void MWindow::create_objects(int want_gui,
 	if(debug) PRINT_TRACE
 	init_ladspa_plugins(this, preferences);
 	if(debug) PRINT_TRACE
-	init_plugin_tips(*plugindb);
+	init_plugin_tips(*plugindb, cin_lang);
 	if(splash_window)
 		splash_window->operation->update(_("Initializing GUI"));
 	if(debug) PRINT_TRACE