RemoteControl.cpp   RemoteControl.cpp 
skipping to change at line 92 skipping to change at line 92
//needed to ensure clean shutdown of server before threading errors can occur //needed to ensure clean shutdown of server before threading errors can occur
connect(&StelApp::getInstance(), &StelApp::aboutToQuit, this, &Remot eControl::stopServer, Qt::DirectConnection); connect(&StelApp::getInstance(), &StelApp::aboutToQuit, this, &Remot eControl::stopServer, Qt::DirectConnection);
} }
RemoteControl::~RemoteControl() RemoteControl::~RemoteControl()
{ {
delete configDialog; delete configDialog;
if(httpListener) if(httpListener)
{ {
//we manually delete the listener here to make sure
//all connections are closed before the requesthandler is de
leted
delete httpListener; delete httpListener;
httpListener = Q_NULLPTR;
} }
if(requestHandler)
requestHandler->deleteLater();
} }
bool RemoteControl::configureGui(bool show) bool RemoteControl::configureGui(bool show)
{ {
if (show) if (show)
configDialog->setVisible(true); configDialog->setVisible(true);
return true; return true;
} }
//! Determine which "layer" the plugin's drawing will happen on. //! Determine which "layer" the plugin's drawing will happen on.
skipping to change at line 142 skipping to change at line 143
//make sure its absolute, otherwise QtWebApp will look relative to w orking dir //make sure its absolute, otherwise QtWebApp will look relative to w orking dir
QDir dirPath(path); QDir dirPath(path);
if(!dirPath.exists()) if(!dirPath.exists())
qWarning()<<"[RemoteControl] Webroot folder invalid, can not use HTML interface"; qWarning()<<"[RemoteControl] Webroot folder invalid, can not use HTML interface";
settings.path = dirPath.absolutePath(); settings.path = dirPath.absolutePath();
#ifndef QT_NO_DEBUG #ifndef QT_NO_DEBUG
//"disable" cache for development //"disable" cache for development
settings.cacheTime = 1; settings.cacheTime = 1;
settings.maxAge = 1; settings.maxAge = 1;
#endif #endif
requestHandler = new RequestHandler(settings); requestHandler = new RequestHandler(settings, this);
StelApp& app = StelApp::getInstance(); StelApp& app = StelApp::getInstance();
// Create action for enable/disable & hook up signals // Create action for enable/disable & hook up signals
addAction("actionShow_Remote_Control", N_("Remote Control"), N_("Rem ote control"), "enabled", ""); addAction("actionShow_Remote_Control", N_("Remote Control"), N_("Rem ote control"), "enabled", "");
// Add a toolbar button. TODO: decide whether a button is necessary at all. Maye the button should not only enable, but call the GUI dialog di rectly? // Add a toolbar button. TODO: decide whether a button is necessary at all. Maye the button should not only enable, but call the GUI dialog di rectly?
try try
{ {
StelGui* gui = dynamic_cast<StelGui*>(app.getGui()); StelGui* gui = dynamic_cast<StelGui*>(app.getGui());
 End of changes. 4 change blocks. 
3 lines changed or deleted 5 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/