Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-03-21 17:34:57 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Work around crash in std::filesystem due to unexpected char encoding

Browse Source
This commit is contained in:
WarmUpTill 2024-09-01 17:12:16 +02:00 committed by WarmUpTill
parent 2d035758f4
commit 94263cc7a0
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/advanced-scene-switcher.cpp
View File

@ -15,7 +15,6 @@
#include "utility.hpp"
#include "version.h"
#include <filesystem>
#include <obs-frontend-api.h>
#include <QAction>
#include <QDirIterator>
@ -85,8 +84,8 @@ static void DisplayMissingDataDirWarning()
"Please check installation instructions!\n\n"
"Data most likely expected at:\n\n";
#ifdef _WIN32
msg += QString::fromStdString(
(std::filesystem::current_path().string()));
msg += QDir::currentPath();
msg += "/";
#endif
msg += obs_get_module_data_path(obs_current_module());

5
lib/utils/file-selection.cpp
View File

@ -4,7 +4,6 @@
#include <QLayout>
#include <QFileDialog>
#include <QStandardPaths>
#include <filesystem>
namespace advss {
@ -38,8 +37,8 @@ void FileSelection::SetPath(const QString &path)
QString FileSelection::ValidPathOrDesktop(const QString &path)
{
if (std::filesystem::exists(
std::filesystem::path(path.toStdString()))) {
QFileInfo fileInfo(path);
if (fileInfo.isFile()) {
return path;
}
return QStandardPaths::writableLocation(

12
plugins/video/paramerter-wrappers.cpp
View File

@ -1,6 +1,6 @@
#include "paramerter-wrappers.hpp"
#include <filesystem>
#include <QFileInfo>
#include <source-helpers.hpp>
namespace advss {
@ -321,10 +321,12 @@ void OCRParameters::SetPageMode(tesseract::PageSegMode mode)
bool OCRParameters::SetLanguageCode(const std::string &value)
{
std::string dataPath = obs_get_module_data_path(obs_current_module()) +
std::string("/res/ocr") + "/" + value +
".traineddata";
if (!std::filesystem::exists(dataPath)) {
const auto dataPath =
QString(obs_get_module_data_path(obs_current_module())) +
QString("/res/ocr") + "/" + QString::fromStdString(value) +
".traineddata";
QFileInfo fileInfo(dataPath);
if (!fileInfo.exists(dataPath)) {
return false;
}
Setup();