undo_history: fix move between documents

facsimiles · Nov 5, 2024 · 43d21a4 · 43d21a4
1 parent 6f27cc9
commit 43d21a4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 25 deletions.
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
@@ -103,42 +103,20 @@ void UndoHistory::disconnectEventLog()
 {
     if (_event_log) {
         _event_log->removeDialogConnection(&_event_list_view, &_callback_connections);
-        _event_log->remove_destroy_notify_callback(this);
     }
 }
 
 void UndoHistory::connectEventLog()
 {
     if (auto document = getDocument()) {
         _event_log = document->get_event_log();
-        _event_log->add_destroy_notify_callback(this, &_handleEventLogDestroyCB);
         _event_list_store = _event_log->getEventListStore();
         _event_list_view.set_model(_event_list_store);
         _event_log->addDialogConnection(&_event_list_view, &_callback_connections);
         _event_list_view.scroll_to_row(_event_list_store->get_path(_event_list_selection->get_selected()));
     }
 }
 
-void UndoHistory::_handleEventLogDestroyCB(sigc::notifiable * const data)
-{
-    if (data) {
-        UndoHistory *self = reinterpret_cast<UndoHistory*>(data);
-        self->_handleEventLogDestroy();
-    }
-}
-
-// called *after* _event_log has been destroyed.
-void UndoHistory::_handleEventLogDestroy()
-{
-    if (_event_log) {
-        auto blocker = SignalBlocker{_callback_connections[EventLog::CALLB_SELECTION_CHANGE]};
-
-        _event_list_view.unset_model();
-        _event_list_store.reset();
-        _event_log = nullptr;
-    }
-}
-
 void
 UndoHistory::_onListSelectionChange()
 {

diff --git a/src/ui/dialog/undo-history.h b/src/ui/dialog/undo-history.h
@@ -91,12 +91,9 @@ class UndoHistory : public DialogBase
 
     EventLog::CallbackMap _callback_connections;
 
-    static void _handleEventLogDestroyCB(sigc::notifiable *data);
-
     void disconnectEventLog();
     void connectEventLog();
 
-    void _handleEventLogDestroy();
     void _onListSelectionChange();
     void _onExpandEvent(const Gtk::TreeModel::iterator &iter, const Gtk::TreeModel::Path &path);
     void _onCollapseEvent(const Gtk::TreeModel::iterator &iter, const Gtk::TreeModel::Path &path);