diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 6e4f7b383..55b24c5b9 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -1146,9 +1146,9 @@ void CMoviePlayerGui::stopPlayBack(void)
 		cond.broadcast();
 		pthread_join(bgThread, NULL);
 		bgThread = 0;
+		livestreamInfo1.clear();
+		livestreamInfo2.clear();
 	}
-	livestreamInfo1.clear();
-	livestreamInfo2.clear();
 	printf("%s: stopped\n", __func__);
 }
 
diff --git a/src/gui/widget/textbox.cpp b/src/gui/widget/textbox.cpp
index 6c78b4f48..4750de544 100644
--- a/src/gui/widget/textbox.cpp
+++ b/src/gui/widget/textbox.cpp
@@ -713,7 +713,7 @@ void CTextBox::refreshText(void)
 		frameBuffer->paintBoxRel(tx, ty-th, tw, th, COL_RED, m_nBgRadius, m_nBgRadiusType);
 #endif
 		//TRACE("[CTextBox] %s Line %d m_cFrame.iX %d m_cFrameTextRel.iX %d\r\n", __FUNCTION__, __LINE__, m_cFrame.iX, m_cFrameTextRel.iX);
-		m_pcFontText->RenderString(tx, ty, tw, m_cLineArray[i].c_str(), m_textColor, 0, m_renderMode | (m_utf8_encoded) ? Font::IS_UTF8 : 0);
+		m_pcFontText->RenderString(tx, ty, tw, m_cLineArray[i].c_str(), m_textColor, 0, m_renderMode | ((m_utf8_encoded) ? Font::IS_UTF8 : 0));
 		m_old_cText = m_cText;
 		y += m_nFontTextHeight;
 	}