Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PoroCYon
Bonzomatic
Commits
68be0132
Commit
68be0132
authored
May 05, 2019
by
Gargaj
Browse files
Fix font selection / detection flow (fixes #103)
parent
e049aa74
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main.cpp
View file @
68be0132
...
...
@@ -104,15 +104,17 @@ int main(int argc, const char *argv[])
std
::
map
<
int
,
std
::
string
>
midiRoutes
;
const
char
*
szDefaultFontPath
=
Misc
::
GetDefaultFontPath
();
if
(
!
szDefaultFontPath
)
{
printf
(
"Misc::GetDefaultFontPath couldn't find ANY default fonts!
\n
"
);
return
-
1
;
}
SHADEREDITOR_OPTIONS
editorOptions
;
editorOptions
.
nFontSize
=
16
;
editorOptions
.
sFontPath
=
szDefaultFontPath
;
if
(
!
szDefaultFontPath
)
{
printf
(
"Misc::GetDefaultFontPath couldn't find ANY default fonts!
\n
"
);
}
else
{
editorOptions
.
sFontPath
=
szDefaultFontPath
;
}
editorOptions
.
nOpacity
=
0xC0
;
editorOptions
.
bUseSpacesForTabs
=
true
;
editorOptions
.
nTabSize
=
2
;
...
...
@@ -208,7 +210,7 @@ int main(int argc, const char *argv[])
}
Capture
::
LoadSettings
(
options
);
}
else
if
(
!
editorOptions
.
sFontPath
.
size
())
if
(
!
editorOptions
.
sFontPath
.
size
())
{
printf
(
"Couldn't find any of the default fonts. Please specify one in config.json
\n
"
);
return
-
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment