From b21f1b32ed28ec7bd793a9c894ca6642226f4038 Mon Sep 17 00:00:00 2001
From: Yuriy Puchkov <yuriy.puchkov@namecheap.com>
Date: Mon, 6 Jul 2020 14:48:12 +0300
Subject: [PATCH] Set 'Copy URL after upload' turned on by default

---
 .travis.yml                  | 2 +-
 appveyor.yml                 | 2 +-
 flameshot.pro                | 2 +-
 src/utils/confighandler.cpp  | 6 +++++-
 update_version_everywhere.sh | 4 ++--
 win_setup/flameshot.iss      | 4 ++--
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5842097f..09e2e59b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ env:
       # Environment variables for packaging
       - PRODUCT=flameshot
       #TODO: we should take version from the last tag in git history + build number
-      - VERSION=0.7.2
+      - VERSION=0.7.3
       - RELEASE=1
       - ARCH=x86_64
       # Dockerfile from https://github.com/flameshotapp/flameshot-docker-images
diff --git a/appveyor.yml b/appveyor.yml
index be8c1a31..06c5bc55 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 image: Visual Studio 2015
 
 #TODO: we should take version from the last tag in git history + build number
-version: 0.7.2.{build}
+version: 0.7.3.{build}
 # Major_Version_Number.Minor_Version_Number.Patch_Number.Build_Number
 
 skip_branch_with_pr: true
diff --git a/flameshot.pro b/flameshot.pro
index 2475330f..619b10e0 100644
--- a/flameshot.pro
+++ b/flameshot.pro
@@ -6,7 +6,7 @@
 
 win32:LIBS += -luser32 -lshell32
 
-BASE_VERSION = 0.7.2
+BASE_VERSION = 0.7.3
 TAG_VERSION = "$$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags)"
 isEmpty(TAG_VERSION){
     TAG_VERSION = $$BASE_VERSION
diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp
index 14f3e55f..6c8d0f0f 100644
--- a/src/utils/confighandler.cpp
+++ b/src/utils/confighandler.cpp
@@ -326,7 +326,11 @@ void ConfigHandler::setCloseAfterScreenshot(const bool close) {
 }
 
 bool ConfigHandler::copyAndCloseAfterUploadEnabled() {
-    return m_settings.value(QStringLiteral("copyAndCloseAfterUpload")).toBool();
+    bool res = true;
+    if (m_settings.contains(QStringLiteral("copyAndCloseAfterUpload"))) {
+        res = m_settings.value(QStringLiteral("copyAndCloseAfterUpload")).toBool();
+    }
+    return res;
 }
 
 void ConfigHandler::setCopyAndCloseAfterUploadEnabled(const bool value) {
diff --git a/update_version_everywhere.sh b/update_version_everywhere.sh
index 6c17417b..68c9f047 100755
--- a/update_version_everywhere.sh
+++ b/update_version_everywhere.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-BASE_VERSION_OLD=0.7.1
-BASE_VERSION_NEW=0.7.2
+BASE_VERSION_OLD=0.7.2
+BASE_VERSION_NEW=0.7.3
 
 sed -i "s/BASE_VERSION = ${BASE_VERSION_OLD}/BASE_VERSION = ${BASE_VERSION_NEW}/g" flameshot.pro
 
diff --git a/win_setup/flameshot.iss b/win_setup/flameshot.iss
index 6ef35402..9f0a451e 100644
--- a/win_setup/flameshot.iss
+++ b/win_setup/flameshot.iss
@@ -6,9 +6,9 @@
 
 [Setup]
 AppName=FlameShot
-AppVersion=0.7.2
+AppVersion=0.7.3
 AppCopyright=NameCheap inc.
-VersionInfoVersion=0.7.2
+VersionInfoVersion=0.7.3
 WizardStyle=modern
 DefaultDirName={autopf}\FlameShot
 DefaultGroupName=FlameShot