summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/encoder.cc1
-rw-r--r--src/lib/job.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 06fc81ad7..6fe745dd7 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -347,6 +347,7 @@ try
LOG_TIMING ("finish-local-encode thread=%1 frame=%2", boost::this_thread::get_id(), vf->index());
} catch (std::exception& e) {
LOG_ERROR (N_("Local encode failed (%1)"), e.what ());
+ throw;
}
}
diff --git a/src/lib/job.cc b/src/lib/job.cc
index c4632a83c..c228defc5 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -133,7 +133,7 @@ Job::run_wrapper ()
} catch (std::bad_alloc& e) {
- set_error (_("Out of memory"), _("There was not enough memory to do this."));
+ set_error (_("Out of memory"), _("There was not enough memory to do this. If you are running a 32-bit operating system try reducing the number of encoding threads in the General tab of Preferences."));
set_progress (1);
set_state (FINISHED_ERROR);