Commit 3f708176 authored by winckel's avatar winckel

Allowed activities in main windows while waiting to connect.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4966 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 6e051abb
...@@ -693,7 +693,7 @@ gboolean ui_callback_on_connect(GtkWidget *widget, gpointer data) ...@@ -693,7 +693,7 @@ gboolean ui_callback_on_connect(GtkWidget *widget, gpointer data)
return FALSE; return FALSE;
} }
dialogbox_connect = gtk_message_dialog_new (GTK_WINDOW(ui_main_data.window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_OTHER, dialogbox_connect = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_OTHER,
GTK_BUTTONS_CANCEL, message_formats[start ? 0 : 1], ui_ip, ui_port); GTK_BUTTONS_CANCEL, message_formats[start ? 0 : 1], ui_ip, ui_port);
gtk_window_set_title (GTK_WINDOW(dialogbox_connect), "Connect"); gtk_window_set_title (GTK_WINDOW(dialogbox_connect), "Connect");
...@@ -721,6 +721,7 @@ gboolean ui_callback_on_connect(GtkWidget *widget, gpointer data) ...@@ -721,6 +721,7 @@ gboolean ui_callback_on_connect(GtkWidget *widget, gpointer data)
operation_running = FALSE; operation_running = FALSE;
} }
gtk_widget_destroy (dialogbox_connect); gtk_widget_destroy (dialogbox_connect);
dialogbox_connect = NULL;
} }
} }
...@@ -733,8 +734,15 @@ gboolean ui_callback_on_disconnect(GtkWidget *widget, gpointer data) ...@@ -733,8 +734,15 @@ gboolean ui_callback_on_disconnect(GtkWidget *widget, gpointer data)
ui_pipe_write_message (ui_main_data.pipe_fd[0], UI_PIPE_DISCONNECT_EVT, NULL, 0); ui_pipe_write_message (ui_main_data.pipe_fd[0], UI_PIPE_DISCONNECT_EVT, NULL, 0);
ui_enable_connect_button (); if (dialogbox_connect != NULL)
operation_running = FALSE; {
gtk_dialog_response(GTK_DIALOG (dialogbox_connect), GTK_RESPONSE_CLOSE);
}
else
{
ui_enable_connect_button ();
operation_running = FALSE;
}
return TRUE; return TRUE;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment