aboutsummaryrefslogtreecommitdiff
path: root/src/qt/intro.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-08-18 16:58:04 +0200
committerPieter Wuille <pieter.wuille@gmail.com>2016-09-07 16:17:09 +0200
commit1db3352cc663f6a25a39813c763a2f6263f55e6d (patch)
tree07b488e23edec9725205de01d2f8527fde67336d /src/qt/intro.h
parent75f20652932361a176e72e2ba3477f4604810bb6 (diff)
downloadbitcoin-1db3352cc663f6a25a39813c763a2f6263f55e6d.tar.xz
qt: Fix random segfault when closing "Choose data directory" dialog
The `pickDataDirectory()` function was calling `exit(0)` to quit the application when the user closes the dialog without choosing a data directory. This is a bad idea because a background thread is created (to check free space on the drive of the currently selected datadir). The thread is not stopped and unwound properly, resulting in a potential race condition somewhere deep in Qt. So replace the `exit()` by a boolean return value, and let the stack unwind normally.
Diffstat (limited to 'src/qt/intro.h')
-rw-r--r--src/qt/intro.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qt/intro.h b/src/qt/intro.h
index 9e2e96dc9e..ee768a7ad8 100644
--- a/src/qt/intro.h
+++ b/src/qt/intro.h
@@ -35,10 +35,13 @@ public:
/**
* Determine data directory. Let the user choose if the current one doesn't exist.
*
+ * @returns true if a data directory was selected, false if the user cancelled the selection
+ * dialog.
+ *
* @note do NOT call global GetDataDir() before calling this function, this
* will cause the wrong path to be cached.
*/
- static void pickDataDirectory();
+ static bool pickDataDirectory();
/**
* Determine default data directory for operating system.