Browse Source

Merge pull request #7631 from Chocobo1/webUIaddr

Reinitialize webUI server when "IP address" setting changed
adaptive-webui-19844
Mike Tzou 7 years ago committed by GitHub
parent
commit
f74e2b0130
  1. 10
      src/webui/webui.cpp

10
src/webui/webui.cpp

@ -68,12 +68,14 @@ void WebUI::init()
} }
// http server // http server
const QString serverAddressString = pref->getWebUiAddress();
if (!m_httpServer) { if (!m_httpServer) {
m_webapp = new WebApplication(this); m_webapp = new WebApplication(this);
m_httpServer = new Http::Server(m_webapp, this); m_httpServer = new Http::Server(m_webapp, this);
} }
else { else {
if (m_httpServer->serverPort() != m_port) if ((m_httpServer->serverAddress().toString() != serverAddressString)
|| (m_httpServer->serverPort() != m_port))
m_httpServer->close(); m_httpServer->close();
} }
@ -93,10 +95,8 @@ void WebUI::init()
#endif #endif
if (!m_httpServer->isListening()) { if (!m_httpServer->isListening()) {
const QString addressString = pref->getWebUiAddress(); const auto address = (serverAddressString == "*" || serverAddressString.isEmpty())
const auto address = (addressString == "*" || addressString.isEmpty()) ? QHostAddress::Any : QHostAddress(serverAddressString);
? QHostAddress::Any : QHostAddress(addressString);
bool success = m_httpServer->listen(address, m_port); bool success = m_httpServer->listen(address, m_port);
if (success) { if (success) {
logger->addMessage(tr("Web UI: Now listening on port %1").arg(m_port)); logger->addMessage(tr("Web UI: Now listening on port %1").arg(m_port));

Loading…
Cancel
Save