Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflicts

This commit is contained in:
Agent X 2023-11-06 15:52:33 -05:00
parent 9a6d2a464a
commit 1a7a75bda3
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pc/djui/djui.c
View File

@ -37,7 +37,7 @@ void reset_djui(void) {
sDjuiLuaErrorTimeout = 0; sDjuiLuaErrorTimeout = 0;
if (gDjuiRoot) djui_base_destroy(&gDjuiRoot->base); if (gDjuiRoot) djui_base_destroy(&gDjuiRoot->base);
if (gDjuiConsole) djui_base_destroy(&gDjuiConsole->panel->base); if (gDjuiConsole) djui_base_destroy(&gDjuiConsole->base);
extern u32 sDjuiConsoleMessages; extern u32 sDjuiConsoleMessages;
sDjuiConsoleMessages = 0; sDjuiConsoleMessages = 0;

10
src/pc/djui/djui_chat_box.c
View File

@ -476,16 +476,6 @@ static void djui_chat_box_input_on_text_input(struct DjuiBase *base, char* text)
} }
} }
static void djui_chat_box_input_on_text_input(struct DjuiBase *base, char* text) {
char previousText[MAX_MSG_LENGTH];
strncpy(previousText, gDjuiChatBox->chatInput->buffer, MAX_MSG_LENGTH - 1);
djui_inputbox_on_text_input(base, text);
if (strcmp(previousText, gDjuiChatBox->chatInput->buffer) != 0) {
reset_tab_completion_all();
}
}
void djui_chat_box_toggle(void) { void djui_chat_box_toggle(void) {
if (gDjuiChatBox == NULL) { return; } if (gDjuiChatBox == NULL) { return; }
if (!gDjuiChatBoxFocus) { sDjuiChatBoxClearText = true; } if (!gDjuiChatBoxFocus) { sDjuiChatBoxClearText = true; }