Merge pull request #1576

apps/openmw/mwdialogue/dialoguemanagerimp.cpp

@@ -146,7 +146,6 @@ namespace MWDialogue
                         // TODO play sound
                     }
 
-
                     MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
                     callback->addResponse("", Interpreter::fixDefinesDialog(info->mResponse, interpreterContext));
                     executeScript (info->mResultScript, mActor);
@@ -401,8 +400,10 @@ namespace MWDialogue
                     MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
                     callback->addResponse("", Interpreter::fixDefinesDialog(text, interpreterContext));
 
+                    if (dialogue->mType == ESM::Dialogue::Topic)
+                    {
                         // Make sure the returned DialInfo is from the Dialogue we supplied. If could also be from the Info refusal group,
-                    // in which case it should not be added to the journal.
+                        // in which case it should not be added to the journal
                         for (ESM::Dialogue::InfoContainer::const_iterator iter = dialogue->mInfo.begin();
                             iter!=dialogue->mInfo.end(); ++iter)
                         {
@@ -412,6 +413,7 @@ namespace MWDialogue
                                 break;
                             }
                         }
+                    }
 
                     executeScript (info->mResultScript, mActor);
                 }

apps/openmw/mwgui/journalbooks.cpp

@@ -281,6 +281,8 @@ BookTypesetter::Ptr JournalBooks::createCyrillicJournalIndex ()
                                                                    textColours.journalTopicOver,
                                                                    textColours.journalTopicPressed, first);
 
+        ch[1]++;
+
         // Words can not be started with these characters
         if (i == 26 || i == 28)
             continue;
@@ -290,8 +292,6 @@ BookTypesetter::Ptr JournalBooks::createCyrillicJournalIndex ()
 
         typesetter->write (style, to_utf8_span (buffer));
         typesetter->lineBreak ();
-
-        ch[1]++;
     }
 
     return typesetter;