Merge pull request #223 from barry-ran/dev

fix: config path bug on mac
This commit is contained in:
Barry 2020-06-15 13:45:51 +08:00 committed by GitHub
commit b39689e6c8
2 changed files with 3 additions and 2 deletions

View file

@ -44,6 +44,7 @@ int main(int argc, char *argv[])
g_msgType = covertLogLevel(Config::getInstance().getLogLevel());
// set on QApplication before
// bug: config path is error on mac
int opengl = Config::getInstance().getDesktopOpenGL();
if (0 == opengl) {
QApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);

View file

@ -14,7 +14,7 @@
#define COMMON_PUSHFILE_DEF "/sdcard/"
#define COMMON_SERVER_VERSION_KEY "ServerVersion"
#define COMMON_SERVER_VERSION_DEF "1.12.1"
#define COMMON_SERVER_VERSION_DEF "1.14"
#define COMMON_SERVER_PATH_KEY "ServerPath"
#define COMMON_SERVER_PATH_DEF "/data/local/tmp/scrcpy-server.jar"
@ -77,7 +77,7 @@ Config &Config::getInstance()
static Config config;
return config;
}
#include <QDebug>
const QString &Config::getConfigPath()
{
if (s_configPath.isEmpty()) {