From 09e9064bbaca5fe7673cd85f907027368a1de633 Mon Sep 17 00:00:00 2001
From: zavarza <zavarza@beam-mw.com>
Date: Tue, 14 May 2019 15:26:10 +0300
Subject: [PATCH] appdata folder name fix

---
 CMakeLists.txt    | 7 -------
 ui/CMakeLists.txt | 3 ++-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index acbc6c272..d3d5158d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,13 +139,6 @@ if(SHOW_CODE_LOCATION)
     add_definitions(-DSHOW_CODE_LOCATION=1)
 endif()
 
-# comment next if block to avoid styling by branchname
-if(BRANCH_NAME MATCHES "testnet")
-    add_definitions(-DBEAM_TESTNET)
-elseif(BRANCH_NAME MATCHES "mainnet")
-    add_definitions(-DBEAM_MAINNET)
-endif()
-
 # uncoment next line for testnet
 #set(BEAM_TESTNET TRUE)
 # uncoment next line for mainnet
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index f2d37e7d8..b3ef4b4be 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -24,6 +24,7 @@ function(BEAM_TRANSLATIONS_COMPILE_QM ts_files out_qm_files)
     set(${out_qm_files} ${QM_FILES} PARENT_SCOPE)
 endfunction()
 
+set(APP_NAME "Beam Wallet${BEAM_DISPLAY_SUFFIX}")
 if(LINUX)
     set (OUTPUT_NAME "BeamWallet${BEAM_SUFFIX_UPPER_CASE}")
 else()
@@ -132,7 +133,7 @@ elseif(BEAM_MAINNET)
     set(BEAM_ICON_SUFFIX "mainnet")
 endif()
 
-add_definitions(-DAPP_NAME=\"${OUTPUT_NAME}\")
+add_definitions(-DAPP_NAME=\"${APP_NAME}\")
 
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/icons/icon_${BEAM_ICON_SUFFIX}.ico
           ${CMAKE_CURRENT_SOURCE_DIR}/icons/beam_${BEAM_ICON_SUFFIX}.png