enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-12-19 15:12:26 +03:00
Code Issues Projects Releases Wiki Activity

Fix crashes on IDE startup (https://github.com/enso-org/ide/pull/393)

Browse Source 
Original commit: e4904224c5
This commit is contained in:
Adam Obuchowicz 2020-04-30 14:42:18 +02:00 committed by GitHub
parent ef5cb279a3
commit 4b5a0dc0c0
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/src/rust/ensogl/src/display/shape/text/glyph/system.rs
View File

@ -267,4 +267,4 @@ impl GlyphSystem {
}
const BEFORE_MAIN : &str = include_str!("glyph.glsl");
const MAIN : &str = "output_color = color_from_msdf(); output_id=uvec4(0,0,0,0);";
const MAIN : &str = "output_color = color_from_msdf(); output_id=vec4(0.0,0.0,0.0,0.0);";

8
gui/src/rust/ide/src/view/node_editor.rs
View File

@ -74,9 +74,13 @@ impl GraphEditorIntegration {
let stream = this.controller.subscribe();
let weak = Rc::downgrade(this);
let handler = process_stream_with_handle(stream,weak,move |notification,this| {
match notification {
notification::Graph::Invalidate => this.invalidate_graph().unwrap(), // FIXME unwrap
let result = match notification {
notification::Graph::Invalidate => this.invalidate_graph(),
};
if let Err(err) = result {
error!(this.logger,"Error while updating graph after receiving {notification:?} \
from controller: {err}");
}
futures::future::ready(())
});
executor::global::spawn(handler);

7
gui/src/rust/lib/logger/src/lib.rs
View File

@ -208,6 +208,13 @@ macro_rules! warning {
};
}
#[macro_export]
macro_rules! error {
($($toks:tt)*) => {
$crate::log_template! {error $($toks)*}
};
}
#[macro_export]
macro_rules! internal_warning {
($($toks:tt)*) => {