diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 43c071556..c0f3e29f5 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -323,11 +323,17 @@ public: ~DOMFrame () { - stop_http_server(); - /* It's important that this is stopped before our frame starts destroying its children, - * otherwise UI elements that it depends on will disappear from under it. - */ - _viewer.stop(); + try { + stop_http_server(); + /* It's important that this is stopped before our frame starts destroying its children, + * otherwise UI elements that it depends on will disappear from under it. + */ + _viewer.stop(); + } catch (std::exception& e) { + LOG_ERROR("Destructor threw %1", e.what()); + } catch (...) { + LOG_ERROR_NC("Destructor threw"); + } } void close(wxCloseEvent& ev) |