Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'hifi/master' into android_places_goto

Browse source
This commit is contained in:
Cristian Luis Duarte 2018-05-02 18:06:56 -03:00
commit 843aa9e261
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Application.cpp
View file

@ -8062,14 +8062,16 @@ void Application::openAndroidActivity(const QString& activityName) {
void Application::enterBackground() { void Application::enterBackground() {
QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(),
"stop", Qt::BlockingQueuedConnection); "stop", Qt::BlockingQueuedConnection);
getActiveDisplayPlugin()->deactivate(); //GC: commenting it out until we fix it
//getActiveDisplayPlugin()->deactivate();
} }
void Application::enterForeground() { void Application::enterForeground() {
QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(),
"start", Qt::BlockingQueuedConnection); "start", Qt::BlockingQueuedConnection);
if (!getActiveDisplayPlugin() || !getActiveDisplayPlugin()->activate()) { //GC: commenting it out until we fix it
/*if (!getActiveDisplayPlugin() || !getActiveDisplayPlugin()->activate()) {
qWarning() << "Could not re-activate display plugin"; qWarning() << "Could not re-activate display plugin";
} }*/
} }
#endif #endif

2
interface/src/Application.h
View file

@ -407,9 +407,9 @@ public slots:
Q_INVOKABLE bool askBeforeSetAvatarUrl(const QString& avatarUrl) { return askToSetAvatarUrl(avatarUrl); } Q_INVOKABLE bool askBeforeSetAvatarUrl(const QString& avatarUrl) { return askToSetAvatarUrl(avatarUrl); }
void updateVerboseLogging();
Q_INVOKABLE void openAndroidActivity(const QString& activityName); Q_INVOKABLE void openAndroidActivity(const QString& activityName);
void updateVerboseLogging();
private slots: private slots:
void onDesktopRootItemCreated(QQuickItem* qmlContext); void onDesktopRootItemCreated(QQuickItem* qmlContext);