From 86d13eaf543f6b25a8762fb76bf65de5e0f41d6b Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 28 May 2018 11:49:52 +0200
Subject: [PATCH] small cleanup at checking camera availability

---
 .../camera/activities/MainActivity.kt         | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
index 842474ac..735d3ad4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
@@ -199,8 +199,10 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
         mIsInPhotoMode = true
         mTimerHandler = Handler()
         mFadeHandler = Handler()
-        mPreview!!.setFlashlightState(if (config.turnFlashOffAtStartup) FLASH_OFF else config.flashlightState)
         setupPreviewImage(true)
+
+        val initialFlashlightState = if (config.turnFlashOffAtStartup) FLASH_OFF else config.flashlightState
+        mPreview!!.setFlashlightState(initialFlashlightState)
     }
 
     private fun initButtons() {
@@ -214,11 +216,9 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
     }
 
     private fun toggleCamera() {
-        if (!checkCameraAvailable()) {
-            return
+        if (checkCameraAvailable()) {
+            mPreview!!.toggleCamera()
         }
-
-        mPreview!!.toggleCamera()
     }
 
     private fun showLastMediaPreview() {
@@ -229,11 +229,9 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
     }
 
     private fun toggleFlash() {
-        if (!checkCameraAvailable()) {
-            return
+        if (checkCameraAvailable()) {
+            mPreview?.toggleFlashlight()
         }
-
-        mPreview?.toggleFlashlight()
     }
 
     fun updateFlashlightState(state: Int) {
@@ -311,8 +309,9 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
             return
         }
 
-        if (mIsVideoCaptureIntent)
+        if (mIsVideoCaptureIntent) {
             mPreview?.trySwitchToVideo()
+        }
 
         mPreview?.setFlashlightState(FLASH_OFF)
         hideTimer()