Signed-off-by: falkTX <falktx@falktx.com>pull/1658/merge
@@ -419,7 +419,7 @@ private: | |||||
{ | { | ||||
helperTool = options.wine.executable.buffer(); | helperTool = options.wine.executable.buffer(); | ||||
if (helperTool[0] == CARLA_OS_SEP && File(helperTool + "64").existsAsFile()) | |||||
if (helperTool.isNotEmpty() && helperTool[0] == CARLA_OS_SEP && File(helperTool + "64").existsAsFile()) | |||||
helperTool += "64"; | helperTool += "64"; | ||||
} | } | ||||
else | else | ||||
@@ -448,7 +448,7 @@ private: | |||||
if (envWinePrefix != nullptr && envWinePrefix[0] != '\0') | if (envWinePrefix != nullptr && envWinePrefix[0] != '\0') | ||||
winePrefix = envWinePrefix; | winePrefix = envWinePrefix; | ||||
else if (options.wine.fallbackPrefix != nullptr && options.wine.fallbackPrefix[0] != '\0') | |||||
else if (options.wine.fallbackPrefix.isNotEmpty() && options.wine.fallbackPrefix[0] != '\0') | |||||
winePrefix = options.wine.fallbackPrefix.buffer(); | winePrefix = options.wine.fallbackPrefix.buffer(); | ||||
else | else | ||||
winePrefix = File::getSpecialLocation(File::userHomeDirectory).getFullPathName() + "/.wine"; | winePrefix = File::getSpecialLocation(File::userHomeDirectory).getFullPathName() + "/.wine"; | ||||
@@ -1,6 +1,6 @@ | |||||
/* | /* | ||||
* Carla Pipe Utilities | * Carla Pipe Utilities | ||||
* Copyright (C) 2013-2023 Filipe Coelho <falktx@falktx.com> | |||||
* Copyright (C) 2013-2024 Filipe Coelho <falktx@falktx.com> | |||||
* | * | ||||
* This program is free software; you can redistribute it and/or | * This program is free software; you can redistribute it and/or | ||||
* modify it under the terms of the GNU General Public License as | * modify it under the terms of the GNU General Public License as | ||||
@@ -1,6 +1,6 @@ | |||||
/* | /* | ||||
* Carla Pipe utils | * Carla Pipe utils | ||||
* Copyright (C) 2013-2023 Filipe Coelho <falktx@falktx.com> | |||||
* Copyright (C) 2013-2024 Filipe Coelho <falktx@falktx.com> | |||||
* | * | ||||
* This program is free software; you can redistribute it and/or | * This program is free software; you can redistribute it and/or | ||||
* modify it under the terms of the GNU General Public License as | * modify it under the terms of the GNU General Public License as | ||||
@@ -1,6 +1,6 @@ | |||||
/* | /* | ||||
* Carla String | * Carla String | ||||
* Copyright (C) 2013-2023 Filipe Coelho <falktx@falktx.com> | |||||
* Copyright (C) 2013-2024 Filipe Coelho <falktx@falktx.com> | |||||
* | * | ||||
* This program is free software; you can redistribute it and/or | * This program is free software; you can redistribute it and/or | ||||
* modify it under the terms of the GNU General Public License as | * modify it under the terms of the GNU General Public License as | ||||
@@ -722,8 +722,7 @@ public: | |||||
carla_safe_assert("pos < fBufferLen", __FILE__, __LINE__); | carla_safe_assert("pos < fBufferLen", __FILE__, __LINE__); | ||||
static char fallback; | |||||
fallback = '\0'; | |||||
static char fallback = '\0'; | |||||
return fallback; | return fallback; | ||||
} | } | ||||
@@ -734,8 +733,7 @@ public: | |||||
carla_safe_assert("pos < fBufferLen", __FILE__, __LINE__); | carla_safe_assert("pos < fBufferLen", __FILE__, __LINE__); | ||||
static char fallback; | |||||
fallback = '\0'; | |||||
static char fallback = '\0'; | |||||
return fallback; | return fallback; | ||||
} | } | ||||