jadedctrl/Chat-O-Matic
jadedctrl/ Chat-O-Matic
1
0
Disbranĉigi 0
Fontkodo Issues 20 Tirpetoj Actions Packages Projects Eldonoj 2 Wiki Activity

Fix SmileTextRender crash 

Fixes #22
This commit is contained in:
Jaidyn Ann 2021-07-13 17:11:49 -05:00
parent 5ec79ebbf5
commit 7f30571703
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
application/views/RenderView.cpp
View File

@ -35,8 +35,10 @@ RenderView::AppendMessage(const char* nick, const char* message,
Append("<", nameColor, bg, nameColor, time); Append("<", nameColor, bg, nameColor, time);
Append(nick, fg, bg, fg); Append(nick, fg, bg, fg);
Append("> ", nameColor, bg, nameColor); Append("> ", nameColor, bg, nameColor);
// AddEmoticText(message, fg, bg); if (Emoticor::Get()->Config() == NULL)
Append(message, fg, bg, fg); Append(message, fg, bg, fg);
else
AddEmoticText(message, fg, bg);
Append("\n", fg, bg, fg); Append("\n", fg, bg, fg);
ScrollToSelection(); ScrollToSelection();
} }
@ -102,7 +104,8 @@ RenderView::PrepareTheme(Theme *fTheme)
fTheme->SetForeground(COL_OTHERNICK, 255, 0, 0); fTheme->SetForeground(COL_OTHERNICK, 255, 0, 0);
fTheme->SetBackground(COL_OTHERNICK, bg); fTheme->SetBackground(COL_OTHERNICK, bg);
fTheme->SetTextRender(R_EMOTICON, &str); if (Emoticor::Get()->Config() != NULL)
fTheme->SetTextRender(R_EMOTICON, &str);
fTheme->SetSoftLineIndent(5.0); fTheme->SetSoftLineIndent(5.0);
fTheme->SetTextMargin(5.0); fTheme->SetTextMargin(5.0);