chore: change reload method
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	continuous-integration/drone/push Build is passing
				
			This commit is contained in:
		
							parent
							
								
									d5859d0c7e
								
							
						
					
					
						commit
						53bda4eb06
					
				@ -407,8 +407,6 @@ pub fn get_animation(name: &str, db: &State<DBPool>) -> Result<Option<Animation>
 | 
			
		||||
        })
 | 
			
		||||
    })?;
 | 
			
		||||
 | 
			
		||||
    println!("got here 4");
 | 
			
		||||
 | 
			
		||||
    while let Some(key_frame_id) = map.next() {
 | 
			
		||||
        let mut key_frame_id = key_frame_id?;
 | 
			
		||||
 | 
			
		||||
@ -430,13 +428,9 @@ pub fn get_animation(name: &str, db: &State<DBPool>) -> Result<Option<Animation>
 | 
			
		||||
            key_frame_id.keyframe.settings.push(light_setting?);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        println!("loop stuff");
 | 
			
		||||
 | 
			
		||||
        animation.animation.key_frames.push(key_frame_id.keyframe);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    println!("got here 6");
 | 
			
		||||
 | 
			
		||||
    Ok(Some(animation.animation))
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										12
									
								
								src/main.rs
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								src/main.rs
									
									
									
									
									
								
							@ -110,7 +110,7 @@ fn ligth_controll(
 | 
			
		||||
        return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    let mut render = render.ok().unwrap();
 | 
			
		||||
    let mut render = render.unwrap();
 | 
			
		||||
 | 
			
		||||
    'mainloop: loop {
 | 
			
		||||
        let action = action.try_recv();
 | 
			
		||||
@ -118,10 +118,14 @@ fn ligth_controll(
 | 
			
		||||
        if let Ok(action) = action {
 | 
			
		||||
            match action {
 | 
			
		||||
                Action::Reload => {
 | 
			
		||||
                    let result = render.load_config();
 | 
			
		||||
                    if result.is_err() || result.as_ref().ok().is_none() {
 | 
			
		||||
                        println!("Ehh failed to load config i guess: {:?}", result.err());
 | 
			
		||||
                    let new_render = render::Render::new(pool.clone());
 | 
			
		||||
 | 
			
		||||
                    if new_render.is_err() || new_render.as_ref().ok().is_none() {
 | 
			
		||||
                        println!("something every wrong {:?}", new_render.err());
 | 
			
		||||
                        continue;
 | 
			
		||||
                    }
 | 
			
		||||
 | 
			
		||||
                    render = new_render.unwrap();
 | 
			
		||||
                }
 | 
			
		||||
                Action::Clear => {
 | 
			
		||||
                    render.blank();
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user