Fix RegisterRestorer not handling potential throws on register assign

This should fix part of #1214
2017-02-13 23:31:16 +00:00 · 2017-02-13 23:31:16 +00:00 · e3a04dfa65
commit e3a04dfa65
parent 55bd3b7949
1 changed files with 8 additions and 1 deletions
--- a/src/commands.cc
+++ b/src/commands.cc
@ -1510,9 +1510,16 @@ public:

    ~RegisterRestorer()
    {
-        if (m_name != 0)
+        if (m_name != 0) try
+        {
            RegisterManager::instance()[m_name] = m_save;
        }
+        catch (runtime_error& e)
+        {
+            write_to_debug_buffer(format("Could not restore register '{}': {}",
+                                         m_name, e.what()));
+        }
+    }

 private:
    Vector<String> m_save;