diff -Nru performous-1.1+lp2766/debian/bzr-builder.manifest performous-1.1+lp2768/debian/bzr-builder.manifest --- performous-1.1+lp2766/debian/bzr-builder.manifest 2017-11-03 18:31:54.000000000 +0000 +++ performous-1.1+lp2768/debian/bzr-builder.manifest 2017-11-30 10:17:36.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.4 deb-version 1.1+lp2766-0~201711031831 -lp:performous revid:git-v1:af07148a336119b1c2f94f9be99a5ef37aebc9c7 +# bzr-builder format 0.4 deb-version 1.1+lp2768-0~201711301017 +lp:performous revid:git-v1:9b78e146f9d5647b0ca8daba5961e380bfc1d36e merge packaging lp:~performous-team/performous/ubuntu revid:tobias-debian@23.gs-20160311195435-zcj5fy4yjvh99cop diff -Nru performous-1.1+lp2766/debian/changelog performous-1.1+lp2768/debian/changelog --- performous-1.1+lp2766/debian/changelog 2017-11-03 18:31:54.000000000 +0000 +++ performous-1.1+lp2768/debian/changelog 2017-11-30 10:17:36.000000000 +0000 @@ -1,8 +1,8 @@ -performous (1.1+lp2766-0~201711031831~ubuntu16.04.1) xenial; urgency=low +performous (1.1+lp2768-0~201711301017~ubuntu16.04.1) xenial; urgency=low * Auto build. - -- Launchpad Package Builder Fri, 03 Nov 2017 18:31:54 +0000 + -- Launchpad Package Builder Thu, 30 Nov 2017 10:17:36 +0000 performous (1.1-2) UNRELEASED; urgency=medium diff -Nru performous-1.1+lp2766/game/main.cc performous-1.1+lp2768/game/main.cc --- performous-1.1+lp2766/game/main.cc 2017-11-03 18:31:52.000000000 +0000 +++ performous-1.1+lp2768/game/main.cc 2017-11-30 10:17:32.000000000 +0000 @@ -189,6 +189,10 @@ while (!gm.isFinished()) { Profiler prof("mainloop"); bool benchmarking = config["graphic/fps"].b(); + if (songs.doneLoading == true && songs.displayedAlert == false) { + gm.dialog(_("Done Loading!\n Loaded ") + std::to_string(songs.loadedSongs()) + " Songs."); + songs.displayedAlert = true; + } if( g_take_screenshot ) { try { window.screenshot(); diff -Nru performous-1.1+lp2766/game/songs.cc performous-1.1+lp2768/game/songs.cc --- performous-1.1+lp2766/game/songs.cc 2017-11-03 18:31:52.000000000 +0000 +++ performous-1.1+lp2768/game/songs.cc 2017-11-30 10:17:32.000000000 +0000 @@ -30,6 +30,10 @@ void Songs::reload() { if (m_loading) return; + if (doneLoading == true) { + doneLoading = false; + displayedAlert = false; + } // Run loading thread m_loading = true; m_thread.reset(new boost::thread(boost::bind(&Songs::reload_internal, boost::ref(*this)))); @@ -60,8 +64,7 @@ std::clog << std::flush; m_loading = false; std::clog << "songs/notice: Done Loading. Loaded " << m_songs.size() << " Songs." << std::endl; - Game* gm = Game::getSingletonPtr(); - //gm->dialog(_("Done Loading!\n Loaded ") + boost::lexical_cast(m_songs.size()) + " Songs."); //crashes on ubuntu 16.10 but not on 16.04 + doneLoading = true; } void Songs::reload_internal(fs::path const& parent) { diff -Nru performous-1.1+lp2766/game/songs.hh performous-1.1+lp2768/game/songs.hh --- performous-1.1+lp2766/game/songs.hh 2017-11-03 18:31:52.000000000 +0000 +++ performous-1.1+lp2768/game/songs.hh 2017-11-30 10:17:32.000000000 +0000 @@ -70,6 +70,9 @@ void sortSpecificChange(int sortOrder, bool descending = false); /// parses file into Song &tmp void parseFile(Song& tmp); + volatile bool doneLoading = false; + volatile bool displayedAlert = false; + size_t loadedSongs() const { return m_songs.size(); } private: class RestoreSel;