Merge remote-tracking branch 'glorf/bugfix-1'

apps/openmw/mwgui/journalwindow.cpp

@@ -114,15 +114,9 @@ MWGui::JournalWindow::JournalWindow (MWBase::WindowManager& parWindowManager)
     //displayLeftText(list.front());
 }
 
-void MWGui::JournalWindow::close()
-{
-    MWBase::Environment::get().getSoundManager()->playSound ("book close", 1.0, 1.0);
-}
-
 void MWGui::JournalWindow::open()
 {
     mPageNumber = 0;
-    MWBase::Environment::get().getSoundManager()->playSound ("book open", 1.0, 1.0);
     if(MWBase::Environment::get().getJournal()->begin()!=MWBase::Environment::get().getJournal()->end())
     {
         book journal;

apps/openmw/mwgui/journalwindow.hpp

@@ -16,7 +16,6 @@ namespace MWGui
         public:
             JournalWindow(MWBase::WindowManager& parWindowManager);
             virtual void open();
-            virtual void close();
 
         private:
             void displayLeftText(std::string text);

apps/openmw/mwinput/inputmanagerimp.cpp

@@ -656,9 +656,15 @@ namespace MWInput
         bool gameMode = !mWindows.isGuiMode();
 
         if(gameMode)
+        {
+            MWBase::Environment::get().getSoundManager()->playSound ("book open", 1.0, 1.0);
             mWindows.pushGuiMode(MWGui::GM_Journal);
+        }
         else if(mWindows.getMode() == MWGui::GM_Journal)
+        {
+            MWBase::Environment::get().getSoundManager()->playSound ("book close", 1.0, 1.0);
             mWindows.popGuiMode();
+        }
         // .. but don't touch any other mode.
     }