Skip to content

Fix/second rig not connecting #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
darkstar099 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix/second rig not connecting #407

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0f24c4
Fix: conf2 race in rig_engaged_cb breaks dual-device engage
darkstar099 May 27, 2026
942c4a7
Fix: disengage race prevents reconnect; fix conf2 vfo_opt socket
darkstar099 May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/gtk-rig-ctrl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,8 +988,11 @@ static void rig_engaged_cb(GtkToggleButton * button, gpointer data)
gtk_widget_set_sensitive(ctrl->DevSel2, TRUE);
ctrl->engaged = FALSE;

/* stop worker thread... */
/* stop worker thread and wait for it to close sockets */
g_mutex_lock(&ctrl->widgetsync);
setconfig(ctrl);
g_cond_wait(&ctrl->widgetready, &ctrl->widgetsync);
g_mutex_unlock(&ctrl->widgetsync);
ctrl->rigctl_thread = NULL;
}
else
Expand All @@ -1003,7 +1006,6 @@ static void rig_engaged_cb(GtkToggleButton * button, gpointer data)
ctrl->rigctl_thread = g_thread_new("rigctl_run", rigctl_run, ctrl);
setconfig(ctrl);
}
ctrl->conf2 = NULL;
}

static GtkWidget *create_target_widgets(GtkRigCtrl * ctrl)
Expand Down Expand Up @@ -2860,7 +2862,7 @@ static void rigctrl_open(GtkRigCtrl * data)
{
open_rigctld_socket(ctrl->conf2, &(ctrl->sock2));
/* set initial dual mode */
ctrl->conf2->vfo_opt = get_vfo_opt(ctrl, ctrl->sock);
ctrl->conf2->vfo_opt = get_vfo_opt(ctrl, ctrl->sock2);
sat_log_log(SAT_LOG_LEVEL_DEBUG,
_("%s:%s: VFO opt2=%d"), __FILE__,
__func__, ctrl->conf2->vfo_opt);
Expand Down