diff options
| author | Nao Pross <naopross@thearcway.org> | 2019-01-28 23:34:28 +0100 |
|---|---|---|
| committer | Nao Pross <naopross@thearcway.org> | 2019-01-28 23:34:28 +0100 |
| commit | 32135f372b8421394a1e63b0bc318621371da6c6 (patch) | |
| tree | b6cb07c1954babddcab257d6666a17634b563c38 /engine/flatland.cpp | |
| parent | Delete signal::emit(channel) (diff) | |
| parent | Channel interface improved (diff) | |
| download | flatland-32135f372b8421394a1e63b0bc318621371da6c6.tar.gz flatland-32135f372b8421394a1e63b0bc318621371da6c6.zip | |
Merge remote-tracking branch 'raffa-https/master'
Diffstat (limited to 'engine/flatland.cpp')
| -rw-r--r-- | engine/flatland.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/flatland.cpp b/engine/flatland.cpp index 309c18b..88b841a 100644 --- a/engine/flatland.cpp +++ b/engine/flatland.cpp @@ -107,10 +107,10 @@ int flat::init_flatland(FlatWindow* w, const flat_status& s, float _fps) // init core channel cout << "Flatland: Initializing core channel" << endl; - - core_chan.start(core::priority_t::max); - - if (!core_chan.map()) { + + // start core channel + // assure that NO OTHER core channel was present before initialization + if (!core_chan.start(core::priority_t::max, &mainsync_job)) { cout << "Flatland: Could not map 'core' channel" << endl; cout << "Flatland: Do not call another channel 'core' before flatland initialization" << endl; |