fly/flightgear
1
0
Fork 0
Code Activity

Revert "NaturalEarthLoader: free the thread, oops"

Browse source 
THis doesn't work in all timing conditions, because the thread
can commit suicide.

This reverts commit aeca129034.
This commit is contained in:
James Turner 2021-02-25 09:02:58 +00:00
parent dc3da7a237
commit fadc900a0a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/GUI/QtLauncher.cxx
View file

@ -629,7 +629,7 @@ bool runLauncherDialog()
// will happen as normal // will happen as normal
http->init(); http->init();
std::unique_ptr<NaturalEarthDataLoaderThread> naturalEarthLoader{new NaturalEarthDataLoaderThread}; QPointer<NaturalEarthDataLoaderThread> naturalEarthLoader = new NaturalEarthDataLoaderThread;
naturalEarthLoader->start(); naturalEarthLoader->start();
// avoid double Apple menu and other weirdness if both Qt and OSG // avoid double Apple menu and other weirdness if both Qt and OSG