From 48d8ebcc478b5b0edf372a47d53dbaebcbd33485 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Mon, 7 Jul 2014 21:46:55 -0700
Subject: [PATCH] Move locale.ini to obs-studio base data directory
Being in with the other locale files causes a bit of confusion,
especially since the locale files will all be renamed to have .ini
extensions.
---
build/data/obs-studio/{locale => }/locale.ini | 0
obs/window-basic-settings.cpp | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
rename build/data/obs-studio/{locale => }/locale.ini (100%)
diff --git a/build/data/obs-studio/locale/locale.ini b/build/data/obs-studio/locale.ini
similarity index 100%
rename from build/data/obs-studio/locale/locale.ini
rename to build/data/obs-studio/locale.ini
diff --git a/obs/window-basic-settings.cpp b/obs/window-basic-settings.cpp
index 4b9d4d35a..0577a2cfd 100644
--- a/obs/window-basic-settings.cpp
+++ b/obs/window-basic-settings.cpp
@@ -137,8 +137,8 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
ui->setupUi(this);
- if (!GetDataFilePath("locale/locale.ini", path))
- throw "Could not find locale/locale.ini path";
+ if (!GetDataFilePath("locale.ini", path))
+ throw "Could not find locale.ini path";
if (localeIni.Open(path.c_str(), CONFIG_OPEN_EXISTING) != 0)
throw "Could not open locale.ini";
--
GitLab