projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix heinous thinko in previous.
[dcpomatic.git]
/
src
/
lib
/
job.cc
diff --git
a/src/lib/job.cc
b/src/lib/job.cc
index a266fbe07c09c8029793b40e70371efc7e66bb76..def874ba2505ac19053c9a4f5e7c04308fc21a15 100644
(file)
--- a/
src/lib/job.cc
+++ b/
src/lib/job.cc
@@
-84,6
+84,8
@@
Job::run_wrapper ()
}
set_error (e.what(), m);
}
set_error (e.what(), m);
+ set_progress (1);
+ set_state (FINISHED_ERROR);
} catch (OpenFileError& e) {
} catch (OpenFileError& e) {
@@
-92,6
+94,9
@@
Job::run_wrapper ()
String::compose (_("DCP-o-matic could not open the file %1. Perhaps it does not exist or is in an unexpected format."), e.file().string())
);
String::compose (_("DCP-o-matic could not open the file %1. Perhaps it does not exist or is in an unexpected format."), e.file().string())
);
+ set_progress (1);
+ set_state (FINISHED_ERROR);
+
} catch (boost::filesystem::filesystem_error& e) {
if (e.code() == boost::system::errc::no_such_file_or_directory) {
} catch (boost::filesystem::filesystem_error& e) {
if (e.code() == boost::system::errc::no_such_file_or_directory) {
@@
-106,15
+111,18
@@
Job::run_wrapper ()
);
}
);
}
+ set_progress (1);
+ set_state (FINISHED_ERROR);
+
} catch (boost::thread_interrupted &) {
set_state (FINISHED_CANCELLED);
} catch (boost::thread_interrupted &) {
set_state (FINISHED_CANCELLED);
- /* This is the only one that is not FINISHED_ERROR; need to return */
- return;
} catch (std::bad_alloc& e) {
set_error (_("Out of memory"), _("There was not enough memory to do this."));
} catch (std::bad_alloc& e) {
set_error (_("Out of memory"), _("There was not enough memory to do this."));
+ set_progress (1);
+ set_state (FINISHED_ERROR);
} catch (std::exception& e) {
} catch (std::exception& e) {
@@
-123,16
+131,19
@@
Job::run_wrapper ()
string (_("It is not known what caused this error.")) + " " + REPORT_PROBLEM
);
string (_("It is not known what caused this error.")) + " " + REPORT_PROBLEM
);
+ set_progress (1);
+ set_state (FINISHED_ERROR);
+
} catch (...) {
set_error (
_("Unknown error"),
string (_("It is not known what caused this error.")) + " " + REPORT_PROBLEM
);
} catch (...) {
set_error (
_("Unknown error"),
string (_("It is not known what caused this error.")) + " " + REPORT_PROBLEM
);
- }
- set_progress (1);
- set_state (FINISHED_ERROR);
+ set_progress (1);
+ set_state (FINISHED_ERROR);
+ }
}
/** @return true if this job is new (ie has not started running) */
}
/** @return true if this job is new (ie has not started running) */