Skip to content
Permalink
Browse files

Fix incorrect save prompt in General Setup

Refs #13046
  • Loading branch information...
bennettpeter committed Jun 11, 2017
1 parent 420a1ea commit 6869ba6beca5c8cadf01249453260a272f6e9020
Showing with 12 additions and 2 deletions.
  1. +1 −1 mythtv/libs/libmyth/standardsettings.h
  2. +11 −1 mythtv/programs/mythtv-setup/backendsettings.cpp
@@ -42,6 +42,7 @@ class MPUBLIC StandardSetting : public QObject, public StorageUser
bool isVisible(void) const { return m_visible; };
bool isEnabled() const { return m_enabled; }
bool haveChanged();
void setChanged(bool changed);
StandardSetting *getParent() const {return m_parent;}

// Gets
@@ -100,7 +101,6 @@ class MPUBLIC StandardSetting : public QObject, public StorageUser
StandardSetting(Storage *_storage = NULL);
virtual ~StandardSetting();
void setParent(StandardSetting *parent);
void setChanged(bool changed);
QString m_settingValue;
bool m_enabled;
QString m_label;
@@ -1095,14 +1095,24 @@ void BackendSettings::Load(void)

QString mastername = masterServerName->getValue();
// new installation - default to master
bool newInstall=false;
if (mastername.isEmpty())
{
mastername = gCoreContext->GetHostName();
newInstall=true;
}
bool ismaster = (mastername == gCoreContext->GetHostName());
isMasterBackend->setValue(ismaster);
priorMasterName = mastername;
priorMasterName = mastername;
isLoaded=true;
masterBackendChanged();
listenChanged();
if (!newInstall)
{
backendServerAddr->setChanged(false);
isMasterBackend->setChanged(false);
masterServerName->setChanged(false);
}
}

void BackendSettings::Save(void)

0 comments on commit 6869ba6

Please sign in to comment.
You can’t perform that action at this time.