summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Src/FrameTools.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2012-08-05 16:53:36 +0200
committerPierre Bourdon <delroth@gmail.com>2012-08-05 16:53:36 +0200
commitb3c9f437db116eae1d6df1068029c8b1eab60357 (patch)
tree61fe2973b0f037d41ffe3772d6ca77b9c1c3114f /Source/Core/DolphinWX/Src/FrameTools.cpp
parent80bf3c2c0b39408d807589c7f300770d2b5d741a (diff)
Return early from DoOpen if the user cancelled the file picker box
Fixes issue 5551
Diffstat (limited to 'Source/Core/DolphinWX/Src/FrameTools.cpp')
-rw-r--r--Source/Core/DolphinWX/Src/FrameTools.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index dbe4dd65e4..a42e76bee6 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -669,6 +669,9 @@ void CFrame::DoOpen(bool Boot)
wxFD_OPEN | wxFD_FILE_MUST_EXIST,
this);
+ if (path.empty())
+ return;
+
std::string currentDir2 = File::GetCurrentDir();
if (currentDir != currentDir2)