Fixes #843

tangrams · Jul 26, 2016 · 3569877 · 3569877
1 parent ddff919
commit 3569877
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/labels/label.cpp b/core/src/labels/label.cpp
@@ -15,10 +15,10 @@ Label::Label(Label::Transform _transform, glm::vec2 _size, Type _type, Options _
       m_options(_options),
       m_anchorType(_anchor) {
 
+    m_state = State::wait_occ;
     if (!m_options.collide || m_type == Type::debug){
         enterState(State::visible, 1.0);
     } else {
-        m_state = State::wait_occ;
         m_transform.state.alpha = 0.0;
     }
 

diff --git a/core/src/tile/tileManager.h b/core/src/tile/tileManager.h
@@ -184,7 +184,7 @@ class TileManager {
 
         std::shared_ptr<DataSource> source;
         std::map<TileID, TileEntry> tiles;
-        int64_t sourceGeneration;
+        int64_t sourceGeneration = 0;
         bool clientDataSource;
     };