Superminaren
/
sample-hive
mirror of https://gitlab.com/samplehive/sample-hive.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixup! Fix database initializing before loading configuration file.

This commit is contained in:
apoorv569 2021-11-14 09:32:04 +05:30
parent e1d89d0b24
commit 1210b5e6ce
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/GUI/MainFrame.cpp
View File

@ -398,6 +398,21 @@ MainFrame::MainFrame()
// Intializing wxTimer // Intializing wxTimer
m_Timer = new wxTimer(this); m_Timer = new wxTimer(this);
// Load default yaml config file.
LoadConfigFile();
// Initialize the database
try
{
m_Database = std::make_unique<Database>();
m_Database->CreateTableSamples();
m_Database->CreateTableHives();
}
catch (std::exception& e)
{
SH_LOG_ERROR("Error! Cannot initialize database {}", e.what());
}
m_TopWaveformPanel = new WaveformViewer(m_TopPanel, *m_Library, *m_MediaCtrl, *m_Database); m_TopWaveformPanel = new WaveformViewer(m_TopPanel, *m_Library, *m_MediaCtrl, *m_Database);
// Binding events. // Binding events.
@ -549,21 +564,6 @@ MainFrame::MainFrame()
m_BottomRightPanelMainSizer->SetSizeHints(m_BottomRightPanel); m_BottomRightPanelMainSizer->SetSizeHints(m_BottomRightPanel);
m_BottomRightPanelMainSizer->Layout(); m_BottomRightPanelMainSizer->Layout();
// Load default yaml config file.
LoadConfigFile();
// Initialize the database
try
{
m_Database = std::make_unique<Database>();
m_Database->CreateTableSamples();
m_Database->CreateTableHives();
}
catch (std::exception& e)
{
SH_LOG_ERROR("Error! Cannot initialize database {}", e.what());
}
// Restore the data previously added to Library // Restore the data previously added to Library
LoadDatabase(); LoadDatabase();