Remove XGD_DATA_DIR as sugestion of su_v

3 files changed, 8 insertions, 4 deletions

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 520efa323..831190bb0 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -2312,6 +2312,8 @@ bool InkscapePreferences::PresentPage(const Gtk::TreeModel::iterator& iter)
         if (desired_page >= PREFS_PAGE_IO && desired_page <= PREFS_PAGE_IO_OPENCLIPART)
             _page_list.expand_row(_path_io, false);
         _page_list.get_selection()->select(iter);
+        if (desired_page == PREFS_PAGE_UI_THEME)
+            symbolicThemeCheck();
         return true;
     }
     return false;
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index cce2509d7..a2f758287 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -571,10 +571,9 @@ protected:
     bool onKBSearchFilter(const Gtk::TreeModel::const_iterator& iter);
     static void onKBShortcutRenderer(Gtk::CellRenderer *rndr, Gtk::TreeIter const &iter);
 
-
 private:
-  void symbolicThemeCheck();
   void themeChange();
+  void symbolicThemeCheck();
   InkscapePreferences();
   InkscapePreferences(InkscapePreferences const &d);
   InkscapePreferences operator=(InkscapePreferences const &d);
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 17501019b..cd924f79d 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -302,8 +302,11 @@ void sp_ui_reload()
             continue;
         }
         sp_create_window(dtw, TRUE);
-        sp_namedview_window_from_document(static_cast<SPDesktop *>(dtw->view));
-        sp_namedview_update_layers_from_document(static_cast<SPDesktop *>(dtw->view));
+        SPDesktop * desktop = static_cast<SPDesktop *>(dtw->view);
+        if (desktop) {
+            sp_namedview_window_from_document(desktop);
+            sp_namedview_update_layers_from_document(desktop);
+        }
         dt->destroyWidget();
         i++;
     }