ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Expand criteria for tag branch names (fixes #2679)

This commit is contained in:
Vicki Pfau 2022-10-14 23:35:32 -07:00
parent d5669c2872
commit 47e704d257
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -1,6 +1,7 @@
0.11.0: (Future) 0.11.0: (Future)
Other fixes: Other fixes:
- Qt: Manually split filename to avoid overzealous splitting (fixes mgba.io/i/2681) - Qt: Manually split filename to avoid overzealous splitting (fixes mgba.io/i/2681)
- Qt: Expand criteria for tag branch names (fixes mgba.io/i/2679)
- Res: Fix species name location in Ruby/Sapphire revs 1/2 (fixes mgba.io/i/2685) - Res: Fix species name location in Ruby/Sapphire revs 1/2 (fixes mgba.io/i/2685)
0.10.0: (2022-10-11) 0.10.0: (2022-10-11)

2
src/platform/qt/ApplicationUpdater.cpp
View File

@ -73,7 +73,7 @@ QStringList ApplicationUpdater::listChannels() {
QString ApplicationUpdater::currentChannel() { QString ApplicationUpdater::currentChannel() {
QLatin1String version(projectVersion); QLatin1String version(projectVersion);
QLatin1String branch(gitBranch); QLatin1String branch(gitBranch);
if (branch == QLatin1String("heads/") + version) { if (branch == QLatin1String("heads/") + version || branch == version) {
return QLatin1String("stable"); return QLatin1String("stable");
} else { } else {
return QLatin1String("dev"); return QLatin1String("dev");