Contestia/Olivia

* Quick change / custom dialog
  * Corrected Contestia callback in confdialog.fl
  * Corrected resetOLIVIA function

src/dialogs/confdialog.cxx

@@ -1702,7 +1702,7 @@ Fl_Choice *mnuContestia_Bandwidth=(Fl_Choice *)0;
 static void cb_mnuContestia_Bandwidth(Fl_Choice* o, void*) {
   progdefaults.contestiabw = o->value();
 set_contestia_default_integ();
-resetOLIVIA();
+resetCONTESTIA();
 progdefaults.changed = true;
 }
 

src/dialogs/confdialog.fl

@@ -141,7 +141,7 @@ static const char szProsigns[] = "~|%|&|+|=|{|}|<|>|[|]| ";} {}
     label {Fldigi configuration} open
     xywh {589 128 540 400} type Double color 45 selection_color 51 labelsize 18 align 80 non_modal visible
   } {
-    Fl_Tabs tabsConfigure {
+    Fl_Tabs tabsConfigure {open
       xywh {-5 0 596 372} color 50 selection_color 50
     } {
       Fl_Group tabOperator {
@@ -2184,7 +2184,7 @@ progdefaults.changed = true;}
             }
           }
           Fl_Group tabContestia {
-            label {Cont'}
+            label {Cont'} open
             xywh {0 50 540 320} hide
           } {
             Fl_Group {} {open
@@ -2194,7 +2194,7 @@ progdefaults.changed = true;}
                 label Bandwidth
                 callback {progdefaults.contestiabw = o->value();
 set_contestia_default_integ();
-resetOLIVIA();
+resetCONTESTIA();
 progdefaults.changed = true;} open
                 tooltip {Select bandwidth} xywh {79 100 85 20} down_box BORDER_BOX align 8
                 code0 {o->add(szContestiaBandwidth);}

src/dialogs/fl_digi.cxx

@@ -810,8 +810,6 @@ void cb_contestiaCustom(Fl_Widget *w, void *arg)
 	cb_init_mode(w, arg);
 }
 
-//
-
 void set_rtty_tab_widgets()
 {
 	selShift->value(progdefaults.rtty_shift);
@@ -2510,14 +2508,19 @@ void cb_QRZ(Fl_Widget *b, void *)
 void status_cb(Fl_Widget *b, void *arg)
 {
 	if (Fl::event_button() == FL_RIGHT_MOUSE) {
-		progdefaults.loadDefaults();
-		tabsConfigure->value(tabModems);
-		tabsModems->value(modem_config_tab);
+		trx_mode md = active_modem->get_mode();
+		if (md >= MODE_OLIVIA && md <= MODE_OLIVIA_64_2000) {
+			cb_oliviaCustom((Fl_Widget *)0, (void *)MODE_OLIVIA);
+		} else {
+			progdefaults.loadDefaults();
+			tabsConfigure->value(tabModems);
+			tabsModems->value(modem_config_tab);
 #if USE_HAMLIB
-		hamlib_restore_defaults();
+			hamlib_restore_defaults();
 #endif
-		rigCAT_restore_defaults();
-		dlgConfig->show();
+			rigCAT_restore_defaults();
+			dlgConfig->show();
+		}
 	}
 	else {
 		if (!quick_change)
@@ -6652,7 +6655,8 @@ void resetRTTY() {
 }
 
 void resetOLIVIA() {
-	if (active_modem->get_mode() == MODE_OLIVIA)
+	trx_mode md = active_modem->get_mode();
+	if (md >= MODE_OLIVIA && md <= MODE_OLIVIA_64_2000)
 		trx_start_modem(active_modem);
 }
 

src/olivia/olivia.cxx

@@ -292,7 +292,7 @@ void olivia::restart()
 	Tx->Bandwidth = bandwidth;
 	Tx->SampleRate = samplerate;
 	Tx->OutputSampleRate = samplerate;
-    txbasefreq = get_txfreq_woffset();
+	txbasefreq = get_txfreq_woffset();
 
 	int fc_offset = Tx->Bandwidth * (1.0 - 0.5/Tx->Tones) / 2.0;
 	if (reverse) {