jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Preserve service hotkey data

Browse Source
This commit is contained in:
Palana 2015-04-05 00:03:40 +02:00
parent 23a2228142
commit 9f0696c1d8
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
obs/window-basic-main.cpp
View File

@ -406,11 +406,13 @@ bool OBSBasic::LoadService()
type = obs_data_get_string(data, "type");
obs_data_t *settings = obs_data_get_obj(data, "settings");
obs_data_t *hotkey_data = obs_data_get_obj(data, "hotkeys");
service = obs_service_create(type, "default_service", settings,
nullptr);
hotkey_data);
obs_service_release(service);
obs_data_release(hotkey_data);
obs_data_release(settings);
obs_data_release(data);

7
obs/window-basic-settings.cpp
View File

@ -1317,9 +1317,14 @@ void OBSBasicSettings::SaveStream1Settings()
{
QString streamType = GetComboData(ui->streamType);
obs_service_t *oldService = main->GetService();
obs_data_t *hotkeyData = obs_hotkeys_save_service(oldService);
obs_service_t *newService = obs_service_create(QT_TO_UTF8(streamType),
"default_service", streamProperties->GetSettings(),
nullptr);
hotkeyData);
obs_data_release(hotkeyData);
if (!newService)
return;