[Fix] Fixed occasional crash on terminating application.

remotes/origin/falkon
nowrep 14 years ago
parent 3167a1a85d
commit bff899ca5a
  1. 2
      src/app/mainapplication.cpp
  2. 5
      src/network/networkmanager.cpp
  3. 3
      src/network/networkmanager.h
  4. 2
      translations/homepage/sr_RS.php

@ -571,6 +571,7 @@ void MainApplication::quitApplication()
} }
m_isClosing = true; m_isClosing = true;
m_networkmanager->disconnectObjects();
if (m_mainWindows.count() > 0) { if (m_mainWindows.count() > 0) {
saveStateSlot(); saveStateSlot();
@ -588,6 +589,7 @@ void MainApplication::quitApplication()
void MainApplication::saveSettings() void MainApplication::saveSettings()
{ {
m_isClosing = true; m_isClosing = true;
m_networkmanager->disconnectObjects();
Settings settings; Settings settings;
settings.beginGroup("SessionRestore"); settings.beginGroup("SessionRestore");

@ -459,3 +459,8 @@ void NetworkManager::loadCertificates()
new CaBundleUpdater(this, this); new CaBundleUpdater(this, this);
} }
void NetworkManager::disconnectObjects()
{
disconnect(this);
}

@ -45,6 +45,7 @@ public:
explicit NetworkManager(QupZilla* mainClass, QObject* parent = 0); explicit NetworkManager(QupZilla* mainClass, QObject* parent = 0);
QNetworkReply* createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice* outgoingData); QNetworkReply* createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice* outgoingData);
void loadSettings();
void saveCertificates(); void saveCertificates();
void loadCertificates(); void loadCertificates();
@ -60,7 +61,7 @@ public:
void setIgnoreAllWarnings(bool state) { m_ignoreAllWarnings = state; } void setIgnoreAllWarnings(bool state) { m_ignoreAllWarnings = state; }
bool isIgnoringAllWarnings() { return m_ignoreAllWarnings; } bool isIgnoringAllWarnings() { return m_ignoreAllWarnings; }
void loadSettings(); void disconnectObjects();
signals: signals:
void finishLoading(bool state); void finishLoading(bool state);

@ -1,4 +1,4 @@
<?php <?php
// Header + Footer // Header + Footer
$site_title = "Капзила - Лаган мултиплатформски веб прегледач"; $site_title = "Капзила - Лаган мултиплатформски веб прегледач";
$qupzilla = "Капзила"; $qupzilla = "Капзила";

Loading…
Cancel
Save