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

Don't use separate update files per OS 

Instead, just use separate version and download entries.
master
jp9000 2014-07-14 03:48:30 -07:00
parent 4e7f076c68
commit e03f34de9f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -859,7 +859,7 @@ void OBSBasic::CheckForUpdates()
{
ui->actionCheckForUpdates->setEnabled(false);
QUrl url("https://obsproject.com/obs2_update/mac_basic.json");
QUrl url("https://obsproject.com/obs2_update/basic.json");
updateReply = networkManager.get(QNetworkRequest(url));
connect(updateReply, SIGNAL(finished()),
this, SLOT(updateFileFinished()));
@ -872,6 +872,14 @@ void OBSBasic::updateFileRead()
updateReturnData.push_back(updateReply->readAll());
}
#ifdef __APPLE__
#define VERSION_ENTRY "windows"
#elif _WIN32
#define VERSION_ENTRY "mac"
#else
#define VERSION_ENTRY "other"
#endif
void OBSBasic::updateFileFinished()
{
ui->actionCheckForUpdates->setEnabled(true);
@ -887,9 +895,9 @@ void OBSBasic::updateFileFinished()
return;
obs_data_t returnData = obs_data_create_from_json(jsonReply);
obs_data_t versionData = obs_data_getobj(returnData, "version");
obs_data_t versionData = obs_data_getobj(returnData, VERSION_ENTRY);
const char *description = obs_data_getstring(returnData, "description");
const char *download = obs_data_getstring(returnData, "download");
const char *download = obs_data_getstring(versionData, "download");
if (returnData && versionData && description && download) {
long major = obs_data_getint(versionData, "major");