Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / radiant / preferences.h

diff --git a/radiant/preferences.h b/radiant/preferences.h
index dbaae1354714a9f78f0752c52ed49a119f66de86..7ce4943ad26b3e46d5a528ff01b8f1cfe37208e1 100644 (file)
--- a/radiant/preferences.h
+++ b/radiant/preferences.h
@@ -129,6 +129,7 @@ void PreferencesDialog_addDisplayPage( const PreferenceGroupCallback& callback )
 void PreferencesDialog_addSettingsPreferences( const PreferencesPageCallback& callback );
 void PreferencesDialog_addSettingsPage( const PreferenceGroupCallback& callback );
 
+bool PreferencesDialog_isRestartRequired();
 void PreferencesDialog_restartRequired( const char* staticName );
 
 template<typename Value>
@@ -269,7 +270,7 @@ std::list<CGameDescription*> mGames;
 
 CGameDialog() :
        m_sGameFile( "" ),
-       m_bGamePrompt( true ),
+       m_bGamePrompt( false ),
        m_bSkipGamePromptOnce( false ),
        m_bForceLogConsole( false ){
 }
@@ -357,9 +358,13 @@ public:
 ui::Widget m_notebook{ui::null};
 
 virtual ~PrefsDlg(){
+       if (m_rc_path) {
        g_string_free( m_rc_path, true );
+       }
+       if (m_inipath) {
        g_string_free( m_inipath, true );
 }
+}
 
 /*!
    path for global settings
@@ -410,6 +415,8 @@ extern preferences_globals_t g_preferences_globals;
 void PreferencesDialog_constructWindow( ui::Window main_window );
 void PreferencesDialog_destroyWindow();
 
+
+void PreferencesDialog_restartIfRequired();
 void PreferencesDialog_showDialog();
 
 void GlobalPreferences_Init();