diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-07 19:25:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-07 19:25:33 +0100 |
| commit | d62877ae6c4e316e43f4052e4b9ba673610012cf (patch) | |
| tree | 3bc50c7c1d625f76dba47128b24326994d593fdb /src/tools/dvdomatic.cc | |
| parent | 5859b758e3a6e0191ce12e77b636c7def58bbc3b (diff) | |
| parent | fa3ed3149bd2464d920f54c92b99f57ce9b4d75f (diff) | |
Merge master.
Diffstat (limited to 'src/tools/dvdomatic.cc')
| -rw-r--r-- | src/tools/dvdomatic.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index a0e7f0de8..6c27892b0 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -314,8 +314,16 @@ private: void file_open (wxCommandEvent &) { wxDirDialog* c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST); - int const r = c->ShowModal (); - + int r; + while (1) { + r = c->ShowModal (); + if (r == wxID_OK && c->GetPath() == wxStandardPaths::Get().GetDocumentsDir()) { + error_dialog (this, _("You did not select a folder. Make sure that you select a folder before clicking Open.")); + } else { + break; + } + } + if (r == wxID_OK) { maybe_save_then_delete_film (); try { |