diff --git a/src/ShuttlePrefs.cpp b/src/ShuttlePrefs.cpp index 4c125ef77..50d25ebc2 100644 --- a/src/ShuttlePrefs.cpp +++ b/src/ShuttlePrefs.cpp @@ -43,7 +43,7 @@ bool ShuttlePrefs::TransferBool( const wxString & Name, bool & bValue, const boo } else { - return (gPrefs->Write( Name, bValue ) && gPrefs->Flush()); + return gPrefs->Write( Name, bValue ); } return true; } @@ -57,7 +57,7 @@ bool ShuttlePrefs::TransferDouble( const wxString & Name, double & dValue, const } else { - return (gPrefs->Write( Name, dValue ) && gPrefs->Flush()); + return gPrefs->Write( Name, dValue ); } return true; } @@ -71,7 +71,7 @@ bool ShuttlePrefs::TransferInt( const wxString & Name, int & iValue, const int & } else { - return (gPrefs->Write( Name, iValue ) && gPrefs->Flush()); + return gPrefs->Write( Name, iValue ); } return true; } @@ -85,7 +85,7 @@ bool ShuttlePrefs::TransferString( const wxString & Name, wxString & strValue, c } else { - return (gPrefs->Write( Name, strValue ) && gPrefs->Flush()); + return gPrefs->Write( Name, strValue ); } return true; } diff --git a/src/SoundActivatedRecord.cpp b/src/SoundActivatedRecord.cpp index 29f896e17..e066757b2 100644 --- a/src/SoundActivatedRecord.cpp +++ b/src/SoundActivatedRecord.cpp @@ -67,6 +67,9 @@ void SoundActivatedRecord::OnOK(wxCommandEvent & WXUNUSED(event)) { ShuttleGui S( this, eIsSavingToPrefs ); PopulateOrExchange( S ); + + gPrefs->Flush(); + EndModal(0); } diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp index 3b994ea1d..51cb4c7c0 100644 --- a/src/TrackArtist.cpp +++ b/src/TrackArtist.cpp @@ -3170,8 +3170,6 @@ void TrackArtist::UpdatePrefs() { mdBrange = gPrefs->Read(ENV_DB_KEY, mdBrange); mShowClipping = gPrefs->Read(wxT("/GUI/ShowClipping"), mShowClipping); - - gPrefs->Flush(); } // Draws the sync-lock bitmap, tiled; always draws stationary relative to the DC diff --git a/src/export/ExportFFmpegDialogs.cpp b/src/export/ExportFFmpegDialogs.cpp index 705b71970..0b1308a1b 100644 --- a/src/export/ExportFFmpegDialogs.cpp +++ b/src/export/ExportFFmpegDialogs.cpp @@ -1990,9 +1990,12 @@ void ExportFFmpegOptions::OnOK(wxCommandEvent& WXUNUSED(event)) if (selcdc > -1) gPrefs->Write(wxT("/FileFormats/FFmpegCodec"),mCodecList->GetString(selcdc)); if (selfmt > -1) gPrefs->Write(wxT("/FileFormats/FFmpegFormat"),mFormatList->GetString(selfmt)); gPrefs->Flush(); + ShuttleGui S(this, eIsSavingToPrefs); PopulateOrExchange(S); + gPrefs->Flush(); + EndModal(wxID_OK); return; diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp index ed3b8afc6..a9c4d2f04 100644 --- a/src/export/ExportMultiple.cpp +++ b/src/export/ExportMultiple.cpp @@ -522,6 +522,8 @@ void ExportMultiple::OnExport(wxCommandEvent& WXUNUSED(event)) ShuttleGui S(this, eIsSavingToPrefs); PopulateOrExchange(S); + gPrefs->Flush(); + // Make sure the output directory is in good shape if (!DirOk()) { return; diff --git a/src/export/ExportPCM.cpp b/src/export/ExportPCM.cpp index 65fb67231..876d18f7f 100644 --- a/src/export/ExportPCM.cpp +++ b/src/export/ExportPCM.cpp @@ -216,6 +216,8 @@ bool ExportPCMOptions::TransferDataFromWindow() ShuttleGui S(this, eIsSavingToPrefs); PopulateOrExchange(S); + gPrefs->Flush(); + WriteExportFormatPref(GetFormat()); return true; diff --git a/src/prefs/DevicePrefs.cpp b/src/prefs/DevicePrefs.cpp index c0663c84c..3189ad7ad 100644 --- a/src/prefs/DevicePrefs.cpp +++ b/src/prefs/DevicePrefs.cpp @@ -347,7 +347,6 @@ bool DevicePrefs::Apply() } if (map) { gPrefs->Write(wxT("/AudioIO/PlaybackDevice"), map->deviceString); - gPrefs->Flush(); } map = NULL; @@ -368,7 +367,6 @@ bool DevicePrefs::Apply() } gPrefs->Write(wxT("/AudioIO/RecordChannels"), mChannels->GetSelection() + 1); - return gPrefs->Flush(); } return true; diff --git a/src/prefs/PrefsDialog.cpp b/src/prefs/PrefsDialog.cpp index a545f22b6..9b060ce16 100644 --- a/src/prefs/PrefsDialog.cpp +++ b/src/prefs/PrefsDialog.cpp @@ -407,6 +407,8 @@ void PrefsDialog::OnOK(wxCommandEvent & WXUNUSED(event)) else mUniquePage->Apply(); + gPrefs->Flush(); + SavePreferredPage(); #if USE_PORTMIXER @@ -443,7 +445,6 @@ void PrefsDialog::OnOK(wxCommandEvent & WXUNUSED(event)) WaveformSettings::defaults().LoadPrefs(); - gPrefs->Flush(); EndModal(true); } diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp index bfbe6c45e..8e4264ee2 100644 --- a/src/prefs/RecordingPrefs.cpp +++ b/src/prefs/RecordingPrefs.cpp @@ -189,7 +189,6 @@ bool RecordingPrefs::Apply() if (targetpeak + deltapeak > 100.0 || targetpeak - deltapeak < 0.0) { gPrefs->Write(wxT("/AudioIO/DeltaPeakVolume"), min(100.0 - targetpeak, targetpeak)); - gPrefs->Flush(); } int value; @@ -201,7 +200,7 @@ bool RecordingPrefs::Apply() if (value < 0) gPrefs->Write(wxT("/AudioIO/NumberAnalysis"), AILA_DEF_NUMBER_ANALYSIS); #endif - return gPrefs->Flush(); + return true; } PrefsPanel *RecordingPrefsFactory::Create(wxWindow *parent)