From 34d58e16dd7c8ce7c72a15d180238c350c9eeac5 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 29 Dec 2011 18:21:49 +0100 Subject: Fix crash webinspector related it seems qtwebkit is managing the webinspector on its own, so DON'T try to delete it ourselves... --- src/analyzer/analyzerpanel.cpp | 7 +++---- src/webinspectorpanel.cpp | 8 ++++---- src/webinspectorpanel.h | 1 + 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/analyzer/analyzerpanel.cpp b/src/analyzer/analyzerpanel.cpp index 60f2c612..5be5aa27 100644 --- a/src/analyzer/analyzerpanel.cpp +++ b/src/analyzer/analyzerpanel.cpp @@ -3,6 +3,7 @@ * This file is a part of the rekonq project * * Copyright (C) 2010-2011 by Matthieu Gicquel +* Copyright (C) 2010-2011 by Andrea Diamantini * * * This program is free software; you can redistribute it and/or @@ -74,17 +75,15 @@ void NetworkAnalyzerPanel::toggle(bool enable) connect(page, SIGNAL(loadStarted()), _viewer, SLOT(clear())); connect(manager, SIGNAL(networkData(QNetworkAccessManager::Operation, const QNetworkRequest &, QNetworkReply *)), _viewer, SLOT(addRequest(QNetworkAccessManager::Operation, const QNetworkRequest &, QNetworkReply *))); - - show(); } else { disconnect(page, SIGNAL(loadStarted()), _viewer, SLOT(clear())); disconnect(manager, SIGNAL(networkData(QNetworkAccessManager::Operation, const QNetworkRequest &, QNetworkReply *)), _viewer, SLOT(addRequest(QNetworkAccessManager::Operation, const QNetworkRequest &, QNetworkReply *))); - - hide(); } + + setVisible(enable); } diff --git a/src/webinspectorpanel.cpp b/src/webinspectorpanel.cpp index b3454ccb..59e95167 100644 --- a/src/webinspectorpanel.cpp +++ b/src/webinspectorpanel.cpp @@ -3,6 +3,7 @@ * This file is a part of the rekonq project * * Copyright (C) 2010 by Matthieu Gicquel +* Copyright (C) 2010-2011 by Andrea Diamantini * * * This program is free software; you can redistribute it and/or @@ -57,6 +58,7 @@ void WebInspectorPanel::toggle(bool enable) { MainWindow *w = qobject_cast(parent()); w->actionByName(QL1S("web_inspector"))->setChecked(enable); + if (enable) { w->currentTab()->page()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true); @@ -66,15 +68,13 @@ void WebInspectorPanel::toggle(bool enable) _inspector->setPage(w->currentTab()->page()); setWidget(_inspector); } - show(); } else { w->currentTab()->page()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, false); - delete _inspector; - _inspector = 0; - hide(); } + + setVisible(enable); } diff --git a/src/webinspectorpanel.h b/src/webinspectorpanel.h index 70776a77..92da538b 100644 --- a/src/webinspectorpanel.h +++ b/src/webinspectorpanel.h @@ -3,6 +3,7 @@ * This file is a part of the rekonq project * * Copyright (C) 2010-2011 by Matthieu Gicquel +* Copyright (C) 2010-2011 by Andrea Diamantini * * * This program is free software; you can redistribute it and/or -- cgit v1.2.1