projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
240d083
)
Improve error message when trying to create a new film where a file already exists.
author
Carl Hetherington
<cth@carlh.net>
Wed, 10 Jul 2013 21:50:52 +0000
(22:50 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 10 Jul 2013 21:50:52 +0000
(22:50 +0100)
src/tools/dcpomatic.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic.cc
b/src/tools/dcpomatic.cc
index 670942e85c7ff365c53390a752af1ae14ac33be6..e58b2c182b8527917ce4d3ffd0c6c45e45ad9988 100644
(file)
--- a/
src/tools/dcpomatic.cc
+++ b/
src/tools/dcpomatic.cc
@@
-292,7
+292,7
@@
private:
if (r == wxID_OK) {
if (r == wxID_OK) {
- if (boost::filesystem::
exists
(d->get_path()) && !boost::filesystem::is_empty(d->get_path())) {
+ if (boost::filesystem::
is_directory
(d->get_path()) && !boost::filesystem::is_empty(d->get_path())) {
if (!confirm_dialog (
this,
std_to_wx (
if (!confirm_dialog (
this,
std_to_wx (
@@
-303,6
+303,12
@@
private:
)) {
return;
}
)) {
return;
}
+ } else if (boost::filesystem::is_regular_file (d->get_path())) {
+ error_dialog (
+ this,
+ String::compose (wx_to_std (_("%1 already exists as a file, so you cannot use it for a new film.")), d->get_path().c_str())
+ );
+ return;
}
maybe_save_then_delete_film ();
}
maybe_save_then_delete_film ();