Merge remote-tracking branch 'upstream/master' into infoview

Bradley Austin Davis committed 11 years ago

Commit c4349e72 parents 0fb8884 741420116 files · +51 −29Browse files

Showing the changes to interface/src/Application.cpp (1 of 16 files). Show all

Unified · Split

interface/src/Application.cpp+1−0

@@ -462,6 +462,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 461 unmodified lines
462	addressManager->setOrientationGetter(getOrientationForPath);	462	addressManager->setOrientationGetter(getOrientationForPath);
463		463
464	connect(addressManager.data(), &AddressManager::rootPlaceNameChanged, this, &Application::updateWindowTitle);	464	connect(addressManager.data(), &AddressManager::rootPlaceNameChanged, this, &Application::updateWindowTitle);
		465	connect(this, &QCoreApplication::aboutToQuit, addressManager.data(), &AddressManager::storeCurrentAddress);
465		466
466	#ifdef _WIN32	467	#ifdef _WIN32
467	WSADATA WsaData;	468	WSADATA WsaData;