mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Commit: d7ec14aab0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-20 (Fri, 20 Jan 2017)
This commit is contained in:
vanhofen
2017-01-20 18:55:56 +01:00
parent 9f8048b3d1 43908cb3bf
commit 0a4f152e7e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/movieplayer.cpp
View File

@@ -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__);
}

2
src/gui/widget/textbox.cpp
View File

@@ -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;
}