From 5dfe6d862c9fe3c29b12ada590664d8cac5575f8 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sun, 7 Jan 2018 19:07:02 +0100 Subject: [PATCH] NavigationBar: Clear current webview for all tool buttons Fixes another crash similar to #2537 --- src/lib/navigation/navigationbar.cpp | 5 +++++ src/lib/navigation/navigationbar.h | 1 + 2 files changed, 6 insertions(+) diff --git a/src/lib/navigation/navigationbar.cpp b/src/lib/navigation/navigationbar.cpp index 57155f82c..ef9c92107 100644 --- a/src/lib/navigation/navigationbar.cpp +++ b/src/lib/navigation/navigationbar.cpp @@ -189,6 +189,11 @@ NavigationBar::NavigationBar(BrowserWindow* window) loadSettings(); } +NavigationBar::~NavigationBar() +{ + setCurrentView(nullptr); +} + void NavigationBar::setSplitterSizes(int locationBar, int websearchBar) { QList sizes; diff --git a/src/lib/navigation/navigationbar.h b/src/lib/navigation/navigationbar.h index aebc62b05..0574de808 100644 --- a/src/lib/navigation/navigationbar.h +++ b/src/lib/navigation/navigationbar.h @@ -43,6 +43,7 @@ class FALKON_EXPORT NavigationBar : public QWidget public: explicit NavigationBar(BrowserWindow* window); + ~NavigationBar(); void setSplitterSizes(int locationBar, int websearchBar);