attempted fixing a bug where the first frame of a preanim would display after it has played
This commit is contained in:
		
							parent
							
								
									0cbb6e765f
								
							
						
					
					
						commit
						55803c520d
					
				@ -157,12 +157,12 @@ void AOCharMovie::frame_change(int n_frame)
 | 
				
			|||||||
  if (m_movie->frameCount() - 1 == n_frame && play_once)
 | 
					  if (m_movie->frameCount() - 1 == n_frame && play_once)
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
    preanim_timer->start(m_movie->nextFrameDelay());
 | 
					    preanim_timer->start(m_movie->nextFrameDelay());
 | 
				
			||||||
    //done();
 | 
					    m_movie->stop();
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void AOCharMovie::timer_done()
 | 
					void AOCharMovie::timer_done()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  qDebug() << "timer done called";
 | 
					
 | 
				
			||||||
  done();
 | 
					  done();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -421,7 +421,6 @@ void Courtroom::set_widgets()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  set_size_and_pos(ui_music_list, "music_list");
 | 
					  set_size_and_pos(ui_music_list, "music_list");
 | 
				
			||||||
  ui_music_list->setStyleSheet("QListWidget{background-color: rgba(0, 0, 0, 0);}");
 | 
					  ui_music_list->setStyleSheet("QListWidget{background-color: rgba(0, 0, 0, 0);}");
 | 
				
			||||||
  ui_music_list->setFont(pt_8);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  set_size_and_pos(ui_ic_chat_message, "ic_chat_message");
 | 
					  set_size_and_pos(ui_ic_chat_message, "ic_chat_message");
 | 
				
			||||||
  ui_ic_chat_message->setStyleSheet("background-color: rgba(100, 100, 100, 255);");
 | 
					  ui_ic_chat_message->setStyleSheet("background-color: rgba(100, 100, 100, 255);");
 | 
				
			||||||
 | 
				
			|||||||
@ -11,6 +11,8 @@ QString AOApplication::get_base_path()
 | 
				
			|||||||
  return "/media/omnitroid/Data/winshare/AO/client/base/";
 | 
					  return "/media/omnitroid/Data/winshare/AO/client/base/";
 | 
				
			||||||
#elif defined(OMNI_WIN_DEBUG)
 | 
					#elif defined(OMNI_WIN_DEBUG)
 | 
				
			||||||
  return "E:/AO/client/base/";
 | 
					  return "E:/AO/client/base/";
 | 
				
			||||||
 | 
					#elif defined(OMNI_WIN_DEBUG2)
 | 
				
			||||||
 | 
					  return "F:/winshare/AO/client/base/";
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
  return (QDir::currentPath() + "/base/");
 | 
					  return (QDir::currentPath() + "/base/");
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user