From 7033e8fea51bc112e1a03d87faa6622c03f44204 Mon Sep 17 00:00:00 2001 From: Kevin Peng Date: Thu, 7 Dec 2017 07:17:04 -0800 Subject: [PATCH 1/2] Add include This include should have been added in 0313d34 but was not. This omission causes the build to fail with Qt 5.2.1. --- src/VM.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/VM.cpp b/src/VM.cpp index 3a3fe5d..33066ce 100644 --- a/src/VM.cpp +++ b/src/VM.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include From c13110182999a350ef79913e3d90856ee8314e6c Mon Sep 17 00:00:00 2001 From: Kevin Peng Date: Thu, 7 Dec 2017 07:41:52 -0800 Subject: [PATCH 2/2] Don't mangle path to custom icons I have quite a few custom icons stored in locations outside AQEMU_Data_Folder --- src/VM.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/VM.cpp b/src/VM.cpp index 33066ce..6560372 100644 --- a/src/VM.cpp +++ b/src/VM.cpp @@ -3600,21 +3600,14 @@ bool Virtual_Machine::Load_VM( const QString &file_name ) << "/usr/local/share/aqemu/"; QSettings settings; - bool abs_found = false; for ( int i = 0; i < dataDirs.count(); i++ ) { if ( Icon_Path.startsWith(dataDirs.at(i)) ) { Icon_Path.replace(dataDirs.at(i),settings.value( "AQEMU_Data_Folder","").toString()); - abs_found = true; break; } } - - if ( ! abs_found ) - { - Icon_Path = settings.value( "AQEMU_Data_Folder","").toString() + Icon_Path; - } } // Screenshot Path