diff options
author | wi <william.os4y@gmail.com> | 2015-04-17 14:22:53 +0200 |
---|---|---|
committer | wi <william.os4y@gmail.com> | 2015-04-17 14:22:53 +0200 |
commit | d231558a8be5dea107a2031fb39b9c18ca8b863d (patch) | |
tree | b13752f01be68969208c41acd0ac5a8d7cd0dc43 /lumina-desktop/LSession.h | |
parent | Merge remote-tracking branch 'upstream/master' into deskEditor (diff) | |
parent | Update the system dashboard behavior a bit: (diff) | |
download | lumina-d231558a8be5dea107a2031fb39b9c18ca8b863d.tar.gz lumina-d231558a8be5dea107a2031fb39b9c18ca8b863d.tar.bz2 lumina-d231558a8be5dea107a2031fb39b9c18ca8b863d.zip |
Merge remote-tracking branch 'upstream/master' into deskEditor
Diffstat (limited to 'lumina-desktop/LSession.h')
-rw-r--r-- | lumina-desktop/LSession.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lumina-desktop/LSession.h b/lumina-desktop/LSession.h index 4c9ea15e..5baf72c4 100644 --- a/lumina-desktop/LSession.h +++ b/lumina-desktop/LSession.h @@ -97,7 +97,7 @@ private: SettingsMenu *settingsmenu; QTranslator *currTranslator; QMediaPlayer *mediaObj; - QThread *audioThread; + //QThread *audioThread; QSettings *sessionsettings; bool cleansession; |