Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 14:54:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4050 from birarda/lasagna-not-spaghetti

Browse source 
put back current address storage in Menu
This commit is contained in:
Clément Brisset 2015-01-06 16:29:52 -08:00
commit fb6fb8a38d
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Menu.cpp
View file

@ -750,6 +750,8 @@ void Menu::saveSettings(QSettings* settings) {
scanMenuBar(&saveAction, settings); scanMenuBar(&saveAction, settings);
Application::getInstance()->getAvatar()->saveData(settings); Application::getInstance()->getAvatar()->saveData(settings);
DependencyManager::get<AddressManager>()->storeCurrentAddress();
if (lockedSettings) { if (lockedSettings) {
Application::getInstance()->unlockSettings(); Application::getInstance()->unlockSettings();
} }

3
libraries/networking/src/AddressManager.h
View file

@ -58,6 +58,8 @@ public slots:
void goToUser(const QString& username); void goToUser(const QString& username);
void goToAddressFromObject(const QVariantMap& addressMap); void goToAddressFromObject(const QVariantMap& addressMap);
void storeCurrentAddress();
signals: signals:
void lookupResultsFinished(); void lookupResultsFinished();
void lookupResultIsOffline(); void lookupResultIsOffline();
@ -72,7 +74,6 @@ protected:
private slots: private slots:
void handleAPIResponse(QNetworkReply& requestReply); void handleAPIResponse(QNetworkReply& requestReply);
void handleAPIError(QNetworkReply& errorReply); void handleAPIError(QNetworkReply& errorReply);
void storeCurrentAddress();
private: private:
void setDomainInfo(const QString& hostname, quint16 port, const QString& domainName = QString()); void setDomainInfo(const QString& hostname, quint16 port, const QString& domainName = QString());