From 2db617bc6f7b46267473a5632f236e13aa9da91e Mon Sep 17 00:00:00 2001
From: tux3 <barrdetwix@gmail.com>
Date: Mon, 25 May 2015 22:37:19 +0200
Subject: [PATCH] Recover if tox fails to start

---
 src/core/core.cpp     | 7 +++++++
 src/widget/widget.cpp | 1 +
 2 files changed, 8 insertions(+)

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 129f46be8..79563104e 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -253,6 +253,13 @@ void Core::start()
 
     qsrand(time(nullptr));
 
+    if (!tox)
+    {
+        ready = true;
+        GUI::setEnabled(true);
+        return;
+    }
+
     // set GUI with user and statusmsg
     QString name = getUsername();
     if (!name.isEmpty())
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index 5ca86ca98..5ec179d59 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -414,6 +414,7 @@ void Widget::onFailedToStartCore()
 
 void Widget::onBadProxyCore()
 {
+    Settings::getInstance().setProxyType(0);
     QMessageBox critical(this);
     critical.setText(tr("toxcore failed to start with your proxy settings. qTox cannot run; please modify your "
                "settings and restart.", "popup text"));