diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp index e7cb9916f..89ee42934 100644 --- a/apps/openmw/mwgui/journalwindow.cpp +++ b/apps/openmw/mwgui/journalwindow.cpp @@ -184,11 +184,6 @@ namespace { MWBase::Environment::get().getWindowManager()->popGuiMode (); } - else - { - // play opening sound only if the player has the journal - MWBase::Environment::get().getSoundManager()->playSound ("book open", 1.0, 1.0); - } mModel->load (); setBookMode (); @@ -218,7 +213,7 @@ namespace void close() { - MWBase::Environment::get().getSoundManager()->playSound ("book close", 1.0, 1.0); + mModel->unload (); getPage (LeftBookPage)->showPage (Book (), 0); @@ -438,6 +433,7 @@ namespace void notifyClose(MyGUI::Widget* _sender) { + MWBase::Environment::get().getSoundManager()->playSound ("book close", 1.0, 1.0); MWBase::Environment::get().getWindowManager ()->popGuiMode (); } @@ -476,4 +472,4 @@ namespace MWGui::JournalWindow * MWGui::JournalWindow::create (JournalViewModel::Ptr Model) { return new JournalWindowImpl (Model); -} +} \ No newline at end of file diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp index e9a0e5089..9f149ac33 100644 --- a/apps/openmw/mwinput/inputmanagerimp.cpp +++ b/apps/openmw/mwinput/inputmanagerimp.cpp @@ -656,13 +656,14 @@ namespace MWInput // Toggle between game mode and journal mode bool gameMode = !mWindows.isGuiMode(); - if(gameMode) + if(gameMode && MWBase::Environment::get().getWindowManager ()->getJournalAllowed()) { + 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.