projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e0da7a3
)
swaroop: fix crash when there's an incorrect ecinema KDM.
v2.15.11
author
Carl Hetherington
<cth@carlh.net>
Wed, 10 Jul 2019 19:47:08 +0000
(20:47 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 10 Jul 2019 19:47:08 +0000
(20:47 +0100)
src/wx/swaroop_controls.cc
patch
|
blob
|
history
diff --git
a/src/wx/swaroop_controls.cc
b/src/wx/swaroop_controls.cc
index 782109888a969ec63a11820bfc33b96c422d9b72..5ce6c45fc7a637f6e6c1e99124d596f7698cb422 100644
(file)
--- a/
src/wx/swaroop_controls.cc
+++ b/
src/wx/swaroop_controls.cc
@@
-489,7
+489,7
@@
SwaroopControls::select_playlist (int selected, int position)
}
if (dcp->needs_kdm()) {
/* We didn't get a KDM for this */
}
if (dcp->needs_kdm()) {
/* We didn't get a KDM for this */
- error_dialog (this, "This playlist cannot be loaded as a KDM is missing.");
+ error_dialog (this, "This playlist cannot be loaded as a KDM is missing
or incorrect
.");
deselect_playlist ();
return;
}
deselect_playlist ();
return;
}
@@
-502,10
+502,12
@@
SwaroopControls::select_playlist (int selected, int position)
ffmpeg->add_kdm (*kdm);
ffmpeg->examine (_film, shared_ptr<Job>());
} catch (KDMError& e) {
ffmpeg->add_kdm (*kdm);
ffmpeg->examine (_film, shared_ptr<Job>());
} catch (KDMError& e) {
- error_dialog (this, "Could not load KDM.");
+ error_dialog (this, "This playlist cannot be loaded as a KDM is missing or incorrect.");
+ deselect_playlist ();
+ return;
}
} else {
}
} else {
- error_dialog (this, "This playlist cannot be loaded as a KDM is missing.");
+ error_dialog (this, "This playlist cannot be loaded as a KDM is missing
or incorrect
.");
deselect_playlist ();
return;
}
deselect_playlist ();
return;
}