Avoid unnecessary re-initialization

extremscorner · Nov 17, 2024 · 93e6826 · 93e6826
1 parent 3048460
commit 93e6826
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/libogc/console.c b/libogc/console.c
@@ -661,17 +661,23 @@ static int __gecko_write_safe(void *c,const char *buf,int n)
 	return usb_sendbuffer_safe(chan,buf,n);
 }
 
+static int __gecko_close(void *c)
+{
+	*(s32*)c = -1;
+	return 0;
+}
+
 void CON_EnableGecko(s32 chan,bool safe)
 {
-	if(chan>=0 && !usb_isgeckoalive(chan)) return;
+	if(chan>=0 && (__gecko_chan==chan || !usb_isgeckoalive(chan))) return;
 
 	fclose(stdcon);
 	stdcon = NULL;
 
 	if(chan<0) return;
 	__gecko_chan = chan;
 
-	stdcon = fwopen(&__gecko_chan, safe ? __gecko_write_safe : __gecko_write);
+	stdcon = funopen(&__gecko_chan, NULL, safe ? __gecko_write_safe : __gecko_write, NULL, __gecko_close);
 	if(!stdcon) return;
 	setvbuf(stdcon, NULL, _IOLBF, 0);