From 0ac532f5c95fe600c96c85adec865c180a0019b1 Mon Sep 17 00:00:00 2001
From: Camila San <hello@camila.codes>
Date: Wed, 1 Aug 2018 00:06:17 +0200
Subject: [PATCH] Fixes crash on mac OS and linux.

- The crash was happening when the user could not connect and it would
crash on trying to retrieve and display the navigation apps.
- Checks AccountStatePtr earlier in the function
slotNavigationAppsFetched.
- Cast of pointer stored in QVariant to QMenu was not done correctly -
qvariant_cast works best for user type defined or QMetaType known to
QVariant.

Signed-off-by: Camila San <hello@camila.codes>
---
 src/gui/owncloudgui.cpp | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 1643dcf16..d0212b616 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -818,23 +818,22 @@ void ownCloudGui::buildNavigationAppsMenu(AccountStatePtr account, QMenu *accoun
 
 void ownCloudGui::slotNavigationAppsFetched(const QJsonDocument &reply, int statusCode)
 {
-    auto account = qvariant_cast<AccountStatePtr>(sender()->property(propertyAccountC));
-    auto accountMenu = qvariant_cast<QMenu*>(sender()->property(propertyMenuC));
-
-    if (statusCode == 304) {
-        qCWarning(lcApplication) << "Status code " << statusCode << " Not Modified - No new navigation apps.";
-    } else {
-        if(!reply.isEmpty()){
-            auto element = reply.object().value("ocs").toObject().value("data");
-            auto navLinks = element.toArray();
-            if(account){
+    if(auto account = qvariant_cast<AccountStatePtr>(sender()->property(propertyAccountC))){
+        if (statusCode == 304) {
+            qCWarning(lcApplication) << "Status code " << statusCode << " Not Modified - No new navigation apps.";
+        } else {
+            if(!reply.isEmpty()){
+                auto element = reply.object().value("ocs").toObject().value("data");
+                auto navLinks = element.toArray();
                 _navApps.insert(account, navLinks);
             }
-         }
-    }
+        }
 
-    if(accountMenu)
-        buildNavigationAppsMenu(account, accountMenu);
+        if(QObject *accountMenuObj = qvariant_cast<QObject*>(sender()->property(propertyMenuC))){
+            if(QMenu *accountMenu = dynamic_cast<QMenu*>(accountMenuObj))
+                buildNavigationAppsMenu(account, accountMenu);
+        }
+    }
 }
 
 void ownCloudGui::slotOcsError(int statusCode, const QString &message)