Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PoroCYon
Bonzomatic
Commits
dfdc9561
Commit
dfdc9561
authored
Jul 15, 2017
by
Gargaj
Browse files
move assert after config loading (fixes #39)
parent
164b8379
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main.cpp
View file @
dfdc9561
...
...
@@ -149,15 +149,13 @@ int main()
};
editorOptions
.
sFontPath
=
""
;
int
step
=
0
;
while
(
step
<
2
&&
editorOptions
.
sFontPath
.
size
()
==
0
)
{
while
(
step
<
2
&&
editorOptions
.
sFontPath
.
size
()
==
0
)
{
const
std
::
string
&
current
=
fontPaths
[
step
++
];
if
(
access
(
current
.
c_str
(),
R_OK
)
!=
-
1
)
{
editorOptions
.
sFontPath
=
current
;
}
}
assert
(
editorOptions
.
sFontPath
.
size
()
>
0
);
#endif
editorOptions
.
nOpacity
=
0xC0
;
editorOptions
.
bUseSpacesForTabs
=
true
;
...
...
@@ -290,6 +288,8 @@ int main()
bool
bTexPreviewVisible
=
true
;
assert
(
editorOptions
.
sFontPath
.
size
()
>
0
);
editorOptions
.
rect
=
Scintilla
::
PRectangle
(
nMargin
,
nMargin
,
settings
.
nWidth
-
nMargin
-
nTexPreviewWidth
-
nMargin
,
settings
.
nHeight
-
nMargin
*
2
-
nDebugOutputHeight
);
ShaderEditor
mShaderEditor
(
surface
);
mShaderEditor
.
Initialise
(
editorOptions
);
...
...
Write
Preview
Supports
Markdown
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