From 4bf724892da0e332840b67671a7745ba3e99621d Mon Sep 17 00:00:00 2001
From: keshavbhatt <keshavnrj@gmail.com>
Date: Mon, 26 Apr 2021 03:10:29 +0530
Subject: fix crash on lock screen setup

---
 src/lock.cpp       | 4 ++--
 src/mainwindow.cpp | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/lock.cpp b/src/lock.cpp
index 00d5f99..e5c65d1 100644
--- a/src/lock.cpp
+++ b/src/lock.cpp
@@ -30,9 +30,9 @@ Lock::Lock(QWidget *parent) :
         isLocked = false;
         ui->signup->show();
         ui->login->hide();
+        animate();
         ui->passcode1->setFocus();
-    }
-    else
+    }else
     {
         lock_app();
     }
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index fb9ccce..18dc80c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -207,7 +207,7 @@ void MainWindow::init_settingWidget()
 
 void MainWindow::lockApp()
 {
-    if(lockWidget->isLocked)
+    if(lockWidget != nullptr && lockWidget->isLocked)
         return;
 
     if(settings.value("asdfg").isValid() && settings.value("lockscreen").toBool()==false){
@@ -220,7 +220,6 @@ void MainWindow::lockApp()
     if(settings.value("asdfg").isValid()){
         init_lock();
     }else{
-        if(settings.value("asdfg").isValid() ==false){
             QMessageBox msgBox;
               msgBox.setText("App lock is not configured.");
               msgBox.setIconPixmap(QPixmap(":/icons/information-line.png").scaled(42,42,Qt::KeepAspectRatio,Qt::SmoothTransformation));
@@ -232,7 +231,6 @@ void MainWindow::lockApp()
                     init_lock();
               });
               msgBox.exec();
-        }
     }
 }
 
-- 
cgit v1.2.3