Update to 1.11.0-RC1

2021-03-15 12:57:26 +03:00
parent 5e4506f493
commit 595606287d
323 changed files with 31135 additions and 8529 deletions
--- a/src/textfile_gui.cpp
+++ b/src/textfile_gui.cpp
@@ -194,9 +194,8 @@ void TextfileWindow::SetupScrollbars()

 /* virtual */ void TextfileWindow::SetFontNames(FreeTypeSettings *settings, const char *font_name, const void *os_data)
 {
-#if defined(WITH_FREETYPE) || defined(_WIN32)
+#if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA)
 	strecpy(settings->mono.font, font_name, lastof(settings->mono.font));
-	free(settings->mono.os_handle);
 	settings->mono.os_handle = os_data;
 #endif
 }