tx panadapter possibyl too high issue

diff --git a/radio.c b/radio.c
index 852b11d1bef5114d5fc9324a6a2d0d47e7142d4d..e169379a3fbf5a355336b1d6ac89c235aad95b74 100644 (file)
--- a/radio.c
+++ b/radio.c
@@ -859,22 +859,21 @@ void start_radio() {
   if(display_toolbar) {
     rx_height-=TOOLBAR_HEIGHT;
   }
-  int tx_height=rx_height;
-  rx_height=rx_height/RECEIVERS;
+  //int tx_height=rx_height;
 
   //
   // To be on the safe side, we create ALL receiver panels here
   // If upon startup, we only should display one panel, we do the switch below
   //
   for(i=0;i<RECEIVERS;i++) {
-    receiver[i]=create_receiver(i, buffer_size, fft_size, display_width, updates_per_second, display_width, rx_height);
+    receiver[i]=create_receiver(i, buffer_size, fft_size, display_width, updates_per_second, display_width, rx_height/RECEIVERS);
     setSquelch(receiver[i]);
     receiver[i]->x=0;
     receiver[i]->y=y;
     gtk_fixed_put(GTK_FIXED(fixed),receiver[i]->panel,0,y);
     g_object_ref((gpointer)receiver[i]->panel);
     set_displaying(receiver[i],1);
-    y+=rx_height;
+    y+=rx_height/RECEIVERS;
     // Upon startup, if RIT or CTUN is active, tell WDSP.
     set_offset(receiver[i],vfo[i].offset);
   }

diff --git a/radio_menu.c b/radio_menu.c
index 1c73ce04e8b24a65557c8595078487fd2dc8fcf6..749065b9b8ece719e352eb82c2a2b9dccce43581 100644 (file)
--- a/radio_menu.c
+++ b/radio_menu.c
@@ -213,7 +213,7 @@ void setDuplex() {
     GtkWidget *content=gtk_dialog_get_content_area(GTK_DIALOG(transmitter->dialog));
     gtk_container_remove(GTK_CONTAINER(content),transmitter->panel);
     gtk_widget_destroy(transmitter->dialog);
-    reconfigure_transmitter(transmitter,display_width,rx_height*receivers);
+    reconfigure_transmitter(transmitter,display_width,rx_height);
   }
   g_idle_add(ext_vfo_update, NULL);
 }

diff --git a/toolbar.c b/toolbar.c
index 409a09425947192a5ba9f536d65a955cc3e29b7e..4076e990a4602ad9eaefc24e5d2a402249137938 100644 (file)
--- a/toolbar.c
+++ b/toolbar.c
@@ -280,7 +280,7 @@ static void split_cb (GtkWidget *widget, gpointer data) {
 }
 
 static void duplex_cb (GtkWidget *widget, gpointer data) {
-  if(can_transmit) {
+  if(can_transmit && !isTransmitting()) {
     duplex=(duplex==1)?0:1;
     g_idle_add(ext_set_duplex,NULL);
   }