Merge pull request #133 from lidaobing/issue_132

Issue 132: fix file accepted when cancel the directory chooser dialog.

NEWS.md

@@ -4,6 +4,7 @@
 * [#119] check the return code of `setsockopt`.
 * [#?] switch to GTK+3, and use `GtkApplication`.
 * [#125] fix crash on UdpData::SomeoneSendmsg.
+* [#132] fix file accepted when cancel the directory chooser dialog.
 
 ### refactor
 

src/iptux/DialogPeer.cpp

@@ -1140,6 +1140,9 @@ void DialogPeer::onAcceptButtonClicked(DialogPeer *self) {
   pthread_t pid;
 
   const gchar *filepath = pop_save_path(GTK_WIDGET(self->grpinf->dialog));
+  if(filepath == nullptr) {
+    return;
+  }
   self->progdt.path = filepath;
   /* 考察数据集中是否存在项 */
   widget = GTK_WIDGET(

src/iptux/dialog.cpp

@@ -213,13 +213,9 @@ char *pop_password_settings(GtkWidget *parent) {
   }
   return NULL;
 }
-/**
- * 弹出接收文件存放位置的对话框.
- * @param parent parent window
- * @return path string
- */
+
 const char *pop_save_path(GtkWidget *parent) {
-  const char *path;
+  const char *path = nullptr;
   GtkWidget *dialog;
 
   dialog = gtk_file_chooser_dialog_new(
@@ -228,7 +224,6 @@ const char *pop_save_path(GtkWidget *parent) {
       GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
   gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
                                       g_progdt->path.c_str());
-  path = g_progdt->path.c_str();
   if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
     path = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
   }

src/iptux/dialog.h

@@ -20,6 +20,12 @@ bool pop_request_quit();
 bool pop_request_shared_file(PalInfo *pal);
 char *pop_obtain_shared_passwd(PalInfo *pal);
 char *pop_password_settings(GtkWidget *parent);
+
+/**
+ * 弹出接收文件存放位置的对话框.
+ * @param parent parent window
+ * @return path const char*, if user does not accept, return nullptr
+ */
 const char *pop_save_path(GtkWidget *parent);
 
 }  // namespace iptux