summaryrefslogtreecommitdiff
path: root/Source/Core/Common/Version.cpp
diff options
context:
space:
mode:
authorAdmiral H. Curtiss <pikachu025@gmail.com>2024-04-18 17:21:24 +0200
committerGitHub <noreply@github.com>2024-04-18 17:21:24 +0200
commit1805f6e38158c90b9108895d42ca6cc37d0aeff7 (patch)
tree886506fddd679479bfb266fc279fd38044d22dc0 /Source/Core/Common/Version.cpp
parent8268ae1cf7c5f9c487950835ae5998f9b354144e (diff)
parent38117ef066135aeedf630bab357fbc161bada6e0 (diff)
Merge pull request #12660 from jordan-woyak/hide-makepkg
Hide branch name from title bar when there are no commits ahead of master.
Diffstat (limited to 'Source/Core/Common/Version.cpp')
-rw-r--r--Source/Core/Common/Version.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp
index 7801aaae30..25c678f061 100644
--- a/Source/Core/Common/Version.cpp
+++ b/Source/Core/Common/Version.cpp
@@ -20,7 +20,8 @@ namespace Common
const std::string& GetScmRevStr()
{
static const std::string scm_rev_str = "Dolphin "
-#if !SCM_IS_MASTER
+ // Note this macro can be empty if the master branch does not exist.
+#if 1 - SCM_COMMITS_AHEAD_MASTER - 1 != 0
"[" SCM_BRANCH_STR "] "
#endif
@@ -74,4 +75,10 @@ const std::string& GetNetplayDolphinVer()
return netplay_dolphin_ver;
}
+int GetScmCommitsAheadMaster()
+{
+ // Note this macro can be empty if the master branch does not exist.
+ return SCM_COMMITS_AHEAD_MASTER + 0;
+}
+
} // namespace Common