claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manager: Fix UUID generation for manager config headers

Browse Source 
Fix different UUIDs generating depending on the whether the path
is absolute or relative; they now always match the ones saved
inside .cfg files
Also reduce some code duplication
This commit is contained in:
Alexander Babikov
2025-07-28 20:25:20 +05:00
parent 494a24a3ae
commit dca59145f6
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/qt/qt_vmmanager_system.cpp
View File

@@ -28,6 +28,7 @@
#include <QElapsedTimer>
#include <QProgressDialog>
#include <QWindow>
#include "qt_util.hpp"
#include "qt_vmmanager_system.hpp"
// #include "qt_vmmanager_details_section.hpp"
#include "qt_vmmanager_detailsection.hpp"
@@ -67,16 +68,10 @@ VMManagerSystem::VMManagerSystem(const QString &sysconfig_file) {
// that contains the 86box configuration file
config_name = config_file.dir().dirName();
// The full path of the directory that contains the 86box configuration file
config_dir = shortened_dir = config_file.dir().path();
config_dir = shortened_dir = config_file.dir().absolutePath();
process_status = ProcessStatus::Stopped;
// Main 86Box uses usr_path for UUID which includes the trailing slash.
// Make sure to append the slash here so the UUIDs will match
auto uuid_path = config_dir;
if (!uuid_path.endsWith("/")) {
uuid_path.append("/");
}
// In the configuration file the UUID is used as a unique value
uuid = QUuid::createUuidV5(QUuid{}, uuid_path).toString(QUuid::WithoutBraces);
uuid = util::generateUuid(sysconfig_file);
// That unique value is used to map the information to each individual system.
config_settings = new VMManagerConfig(VMManagerConfig::ConfigType::System, uuid);