Add dialog indication for failed version check

- Resolves #371.

Author: Gumball2415

Dn-FamiTracker.rc

@@ -2127,11 +2127,11 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Update",IDOK,115,175,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,170,175,50,14
-    LTEXT           "A new version of Dn-FamiTracker is now available.",IDC_STATIC,7,7,162,8
+    LTEXT           "A new version of Dn-FamiTracker has not been found.",IDC_VERSION_STATIC,7,7,174,8
     LTEXT           "Version  (released on  )",IDC_VERSIONDATE_MSG,7,21,213,8
-    LTEXT           "Release notes:",IDC_STATIC,7,36,49,8
+    LTEXT           "Release notes:",IDC_VERSION_STATIC2,7,36,213,8
     EDITTEXT        IDC_RELEASE_MSG,7,52,213,80,ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP,WS_EX_TRANSPARENT
-    LTEXT           "Pressing ""Update"" will launch the Github web page for this release.",IDC_STATIC,7,140,213,8
+    LTEXT           "Pressing ""Update"" will open the GitHub page for the latest release.",IDC_VERSION_STATIC3,7,140,213,8
     CONTROL         "Do not remind me again.",IDC_UPDATE_REMIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,156,213,10
 END
 

Source/FamiTracker.cpp

@@ -569,7 +569,10 @@ void CFamiTrackerApp::UnregisterSingleInstance()
 
 void CFamiTrackerApp::CheckNewVersion(bool StartUp)		// // //
 {
-	//return;
+	// !! !! This member will be overwritten.
+	// we do this so the "no new updates" pop-up will only show if the user checks
+	// also, why do we need to pass this to the version checker thread if we're gonna return it again?
+	m_bStartUp = StartUp;
 	m_pVersionChecker = std::make_unique<CVersionChecker>(StartUp);		// // //
 }
 
@@ -746,15 +749,21 @@ BOOL CFamiTrackerApp::OnIdle(LONG lCount)		// // //
 	if (CWinApp::OnIdle(lCount))
 		return TRUE;
 
-	if (m_pVersionChecker && m_pVersionChecker->IsReady())
-		if (auto pChecker = std::move(m_pVersionChecker); auto result = pChecker->GetVersionCheckResult())
-		{
+	if (m_pVersionChecker && m_pVersionChecker->IsReady()) {
+		if (auto pChecker = std::move(m_pVersionChecker); auto result = pChecker->GetVersionCheckResult()) {
 			m_pVersionURL = result->URL;
 			m_pVerInfo = result->VerInfo;
 			m_pVerDesc = result->VerDesc;
 			m_bStartUp = result->StartUp;
+			m_bNewVersion = true;
 			OnVersionCheck();
 		}
+		else {
+			m_bNewVersion = false;
+			m_pVersionURL = "https://github.com/Dn-Programming-Core-Management/Dn-FamiTracker/releases/latest";
+			if (!m_bStartUp) OnVersionCheck();
+		}
+	}
 	return FALSE;
 }
 

Source/FamiTracker.h

@@ -178,6 +178,7 @@ class CFamiTrackerApp : public CWinApp
 public:
 	std::unique_ptr<CVersionChecker> m_pVersionChecker;		// // //
 	std::string		m_pVersionURL, m_pVerInfo, m_pVerDesc;
+	bool m_bNewVersion;
 	bool m_bStartUp;
 
 #ifdef SUPPORT_TRANSLATIONS

Source/VersionChecker.cpp

@@ -162,10 +162,8 @@ void CVersionChecker::ThreadFn(bool startup, std::promise<std::optional<stVersio
 			desc.insert(pos + 1, "\r\n - ");
 			pos += t.size();
 		}
-		int StartUp = 0;
+		int StartUp = int(startup);
 		std::string VerInfo = "Version " + verStr + " (released on " + s + ")\n\n";
-		if (startup)
-			StartUp = 1;
 		std::string url = json["html_url"];
 
 		p.set_value(stVersionCheckResult{ std::move(StartUp), std::move(VerInfo), std::move(desc), std::move(url) });

Source/VersionCheckerDlg.cpp

@@ -58,8 +58,21 @@ END_MESSAGE_MAP()
 
 BOOL CVersionCheckerDlg::OnInitDialog()
 {
-	SetDlgItemText(IDC_VERSIONDATE_MSG, conv::to_t(theApp.m_pVerInfo).data());
-	SetDlgItemText(IDC_RELEASE_MSG, conv::to_t(theApp.m_pVerDesc).data());
+	if (theApp.m_bNewVersion) {
+		SetDlgItemText(IDC_VERSION_STATIC, "A new version of Dn-FamiTracker is now available.");
+		SetDlgItemText(IDC_VERSIONDATE_MSG, conv::to_t(theApp.m_pVerInfo).data());
+		SetDlgItemText(IDC_RELEASE_MSG, conv::to_t(theApp.m_pVerDesc).data());
+		SetDlgItemText(IDC_VERSION_STATIC2, "Release notes:");
+		SetDlgItemText(IDC_VERSION_STATIC3, "Pressing \"Update\" will open the GitHub page for this release.");
+	}
+	else {
+		SetDlgItemText(IDC_VERSION_STATIC, "A new version of Dn-FamiTracker has not been found.");
+		SetDlgItemText(IDC_VERSIONDATE_MSG, "You might be on the latest version.");
+		SetDlgItemText(IDC_VERSION_STATIC2, "If not, go to the latest release to download the latest version.");
+		SetDlgItemText(IDC_VERSION_STATIC3, "Pressing \"Update\" will open the GitHub page for the latest release.");
+		SetDlgItemText(IDC_RELEASE_MSG, "");
+		GetDlgItem(IDC_RELEASE_MSG)->EnableWindow(false);
+	}
 	if (theApp.m_bStartUp)
 		SetDlgItemText(IDC_UPDATE_REMIND, _T("Do not remind me again. (may be re-enabled in config menu)"));
 		//set visible the message

resource.h

@@ -678,8 +678,12 @@
 #define IDC_OPLL_PATCHBYTE2             1538
 #define IDC_OPLL_PATCHNAME2             1539
 #define IDC_STATIC_PATCH3               1540
+#define IDC_VERSION_STATIC              1540
 #define IDC_STATIC_PATCH4               1541
+#define IDC_VERSION_STATIC4             1541
+#define IDC_VERSION_STATIC3             1541
 #define IDC_STATIC_PATCH5               1542
+#define IDC_VERSION_STATIC2             1542
 #define IDC_STATIC_PATCH6               1543
 #define IDC_STATIC_PATCH7               1544
 #define IDC_STATIC_PATCH8               1545
@@ -905,7 +909,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        380
 #define _APS_NEXT_COMMAND_VALUE         33215
-#define _APS_NEXT_CONTROL_VALUE         1537
+#define _APS_NEXT_CONTROL_VALUE         1543
 #define _APS_NEXT_SYMED_VALUE           179
 #endif
 #endif