Add the batch of release v3.2.1 commits (prime)

bcndev · Aug 3, 2018 · 9e77c94 · 9e77c94
1 parent 6537fca
commit 9e77c94
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 19 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -2,6 +2,7 @@
 
 ### v3.2.1
 
+- Fixed a GUI crash in the detached state. 
 - Updated the Bytecoin daemons. 
 
 ### v3.2.0

diff --git a/Windows Installer/Installer.vdproj b/Windows Installer/Installer.vdproj
@@ -1483,23 +1483,23 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Bytecoin"
-        "ProductCode" = "8:{D783D4B5-ED95-4FF0-AFC3-0C020E155860}"
-        "PackageCode" = "8:{63406163-BCD7-46DD-8D89-B2AF7AB833A8}"
+        "ProductCode" = "8:{A29918FF-E6A5-49E8-80E6-46FC45E719F9}"
+        "PackageCode" = "8:{1C861207-D2DA-425D-8D67-FA1DA6EA01E2}"
         "UpgradeCode" = "8:{DC5C7D60-BB08-4B97-B634-E87679CCEB3C}"
         "AspNetVersion" = "8:"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:18.8.2"
+        "ProductVersion" = "8:18.8.3"
         "Manufacturer" = "8:Bytecoin Developers"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
-        "Title" = "8:Bytecoin 3.2.0 Installer"
+        "Title" = "8:Bytecoin 3.2.1 Installer"
         "Subject" = "8:"
         "ARPCONTACT" = "8:Bytecoin Developers"
         "Keywords" = "8:"
-        "ARPCOMMENTS" = "8:Release version of bytecoin from 2 Aug 2018"
+        "ARPCOMMENTS" = "8:Release version of bytecoin from 3 Aug 2018"
         "ARPURLINFOABOUT" = "8:https://bytecoin.org"
         "ARPPRODUCTICON" = "8:_ABCF8F071D16461785EDF6D56ED2ABCE"
         "ARPIconIndex" = "3:0"
@@ -1706,7 +1706,7 @@
                             "ContextData" = "8:"
                             "Attributes" = "3:0"
                             "Setting" = "3:2"
-                            "Value" = "8:Release version 3.2.0 of bytecoin core and GUI wallet from 2018/08/02."
+                            "Value" = "8:Release version 3.2.1 of bytecoin core and GUI wallet from 2018/08/03."
                             "DefaultValue" = "8:#1202"
                             "UsePlugInResources" = "11:TRUE"
                             }
@@ -1945,7 +1945,7 @@
                             "ContextData" = "8:"
                             "Attributes" = "3:0"
                             "Setting" = "3:2"
-                            "Value" = "8:Release version 3.2.0 of bytecoin core and GUI wallet from 2018/08/02."
+                            "Value" = "8:Release version 3.2.1 of bytecoin core and GUI wallet from 2018/08/03."
                             "DefaultValue" = "8:#1202"
                             "UsePlugInResources" = "11:TRUE"
                             }

diff --git a/Windows Installer/Installer32.vdproj b/Windows Installer/Installer32.vdproj
@@ -1483,23 +1483,23 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Bytecoin"
-        "ProductCode" = "8:{E1D3C81F-3062-47AA-953D-C067A40B4789}"
-        "PackageCode" = "8:{83F7EC5F-0FD5-4BE1-804B-2B0DBC773D35}"
+        "ProductCode" = "8:{37C1A2C8-6E6F-40C4-9FD3-17602C2F44E8}"
+        "PackageCode" = "8:{9243D09E-DA9D-448C-ACBD-596AA13962E1}"
         "UpgradeCode" = "8:{DC5C7D60-BB08-4B97-B634-E87679CCEB3C}"
         "AspNetVersion" = "8:"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:18.8.2"
+        "ProductVersion" = "8:18.8.3"
         "Manufacturer" = "8:Bytecoin Developers"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
-        "Title" = "8:32-bit Bytecoin 3.2.0 Installer"
+        "Title" = "8:32-bit Bytecoin 3.2.1 Installer"
         "Subject" = "8:"
         "ARPCONTACT" = "8:Bytecoin Developers"
         "Keywords" = "8:"
-        "ARPCOMMENTS" = "8:32-bit release version of bytecoin from 2 Aug 2018"
+        "ARPCOMMENTS" = "8:32-bit release version of bytecoin from 3 Aug 2018"
         "ARPURLINFOABOUT" = "8:https://bytecoin.org"
         "ARPPRODUCTICON" = "8:_A84FAE3CB14C4108B5D13DF9AD54E661"
         "ARPIconIndex" = "3:0"
@@ -1706,7 +1706,7 @@
                             "ContextData" = "8:"
                             "Attributes" = "3:0"
                             "Setting" = "3:2"
-                            "Value" = "8:32-bit release version 3.2.0 of bytecoin core and GUI wallet from 2018/08/02."
+                            "Value" = "8:32-bit release version 3.2.1 of bytecoin core and GUI wallet from 2018/08/03."
                             "DefaultValue" = "8:#1202"
                             "UsePlugInResources" = "11:TRUE"
                             }
@@ -1945,7 +1945,7 @@
                             "ContextData" = "8:"
                             "Attributes" = "3:0"
                             "Setting" = "3:2"
-                            "Value" = "8:32-bit release version 3.2.0 of bytecoin core and GUI wallet from 2018/08/02."
+                            "Value" = "8:32-bit release version 3.2.1 of bytecoin core and GUI wallet from 2018/08/03."
                             "DefaultValue" = "8:#1202"
                             "UsePlugInResources" = "11:TRUE"
                             }

diff --git a/src/application.cpp b/src/application.cpp
@@ -555,10 +555,11 @@ void WalletApplication::checkProof()
 
 void WalletApplication::showWalletdParams()
 {
-    WalletdParamsDialog dlg(Settings::instance().getConnectionMethod() == ConnectionMethod::BUILTIN, m_mainWindow);
+    WalletdParamsDialog dlg(Settings::instance().getConnectionMethod() == ConnectionMethod::BUILTIN && !Settings::instance().getWalletFile().isEmpty(), m_mainWindow);
     connect(&dlg, &WalletdParamsDialog::restartWalletd, this, &WalletApplication::restartDaemon);
     BuiltinWalletd* walletd = static_cast<BuiltinWalletd*>(walletd_);
-    connect(walletd, &BuiltinWalletd::daemonErrorOccurredSignal, &dlg, &WalletdParamsDialog::reject);
+    if (walletd)
+        connect(walletd, &BuiltinWalletd::daemonErrorOccurredSignal, &dlg, &WalletdParamsDialog::reject);
     dlg.exec();
 }
 

diff --git a/src/bytecoin-gui.pro b/src/bytecoin-gui.pro
@@ -15,7 +15,7 @@ TEMPLATE = app
 macx: QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
 macx: ICON = images/bytecoin.icns
 win32: RC_ICONS = images/bytecoin.ico
-win32: VERSION = 3.18.8.2
+win32: VERSION = 3.18.8.3
 
 #QMAKE_CXXFLAGS += -fno-omit-frame-pointer -fsanitize=address,undefined
 #LIBS += -lasan -lubsan

diff --git a/src/version.h b/src/version.h
@@ -3,9 +3,9 @@
 
 namespace WalletGUI {
 
-constexpr char VERSION[] = "3.2.0";
+constexpr char VERSION[] = "3.2.1";
 constexpr char VERSION_SUFFIX[] = "stable";
-constexpr char REVISION[] = "20180802";
+constexpr char REVISION[] = "20180803";
 
 }