archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-16 11:48:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix code relying on initialization order

Browse source 
Allows Debug - LLVM to boot
This commit is contained in:
Silent 2020-01-30 22:03:36 +01:00 • committed by Ivan
parent aeebcfe141
commit 9f678cc47a
9 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/rpcs3qt/gs_frame.cpp
View file

@ -39,13 +39,13 @@ gs_frame::gs_frame(const QString& title, const QRect& geometry, const QIcon& app
m_disable_mouse = gui_settings->GetValue(gui::gs_disableMouse).toBool();
// Get version by substringing VersionNumber-buildnumber-commithash to get just the part before the dash
std::string version = rpcs3::version.to_string();
std::string version = rpcs3::get_version().to_string();
version = version.substr(0 , version.find_last_of('-'));
// Add branch and commit hash to version on frame unless it's master.
if ((rpcs3::get_branch().compare("master") != 0) && (rpcs3::get_branch().compare("HEAD") != 0))
{
version = version + "-" + rpcs3::version.to_string().substr((rpcs3::version.to_string().find_last_of('-') + 1), 8) + "-" + rpcs3::get_branch();
version = version + "-" + rpcs3::get_version().to_string().substr((rpcs3::get_version().to_string().find_last_of('-') + 1), 8) + "-" + rpcs3::get_branch();
}
m_windowTitle += qstr(" | " + version);