Merge pull request #593 from drowe67/ms-reset-confirmation

Confirm reset before actually doing so.

Author: tmiw

USER_MANUAL.md

@@ -917,7 +917,9 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
 1. Bugfixes:
     * Fix bug preventing frequency updates from being properly suppressed when frequency control is in focus. (PR #585)
     * Fix bug preventing 60 meter frequencies from using USB with DIGU/DIGL disabled. (PR #589)
+    * Fix bug preventing FreeDV Reporter window from closing after resetting configuration to defaults. (PR #593)
 2. Enhancements:
+    * Add confirmation dialog box before actually resetting configuration to defaults. (PR #593)
     * Add ability to double-click FreeDV Reporter entries to change the radio's frequency. (PR #592)
 
 ## V1.9.4 October 2023

src/ongui.cpp

@@ -335,7 +335,9 @@ bool MainFrame::OpenHamlibRig() {
         };
 
         wxGetApp().rigFrequencyController->onRigConnected += [&](IRigController*) {
-            if (wxGetApp().rigFrequencyController && wxGetApp().appConfiguration.rigControlConfiguration.hamlibEnableFreqModeChanges)
+            if (wxGetApp().rigFrequencyController && 
+                wxGetApp().appConfiguration.rigControlConfiguration.hamlibEnableFreqModeChanges &&
+                wxGetApp().appConfiguration.reportingConfiguration.reportingFrequency > 0)
             {
                 wxGetApp().rigFrequencyController->setFrequency(wxGetApp().appConfiguration.reportingConfiguration.reportingFrequency);
                 wxGetApp().rigFrequencyController->setMode(getCurrentMode_());
@@ -564,16 +566,37 @@ void MainFrame::OnTop(wxCommandEvent& event)
 //-------------------------------------------------------------------------
 void MainFrame::OnDeleteConfig(wxCommandEvent&)
 {
-    if(pConfig->DeleteAll())
-    {
-        wxLogMessage(wxT("Config file/registry key successfully deleted."));
-        
-        // Resets all configuration to defaults.
-        loadConfiguration_();
-    }
-    else
+    wxMessageDialog messageDialog(
+        this, "Would you like to restore configuration to defaults?", wxT("Restore Defaults"),
+        wxYES_NO | wxICON_QUESTION | wxCENTRE);
+
+    auto answer = messageDialog.ShowModal();
+    if (answer == wxID_YES)
     {
-        wxLogError(wxT("Deleting config file/registry key failed."));
+        if(pConfig->DeleteAll())
+        {
+            wxLogMessage(wxT("Config file/registry key successfully deleted."));
+            
+            if (wxGetApp().m_sharedReporterObject)
+            {
+                wxGetApp().m_sharedReporterObject = nullptr;
+            }
+
+            if (m_reporterDialog != nullptr)
+            {
+                m_reporterDialog->setReporter(nullptr);
+                m_reporterDialog->Close();
+                m_reporterDialog->Destroy();
+                m_reporterDialog = nullptr;
+            }
+            
+            // Resets all configuration to defaults.
+            loadConfiguration_();
+        }
+        else
+        {
+            wxLogError(wxT("Deleting config file/registry key failed."));
+        }
     }
 }