Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-20 14:55:09 +03:00
Code Activity

Simulators and firmwares unregistered when application ends (fixes memory leaks)

Browse source
This commit is contained in:
Damjan Adamic 2015-10-24 20:10:17 +02:00
parent ee4ea18a3e
commit 2a54bee20b
8 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
companion/src/companion.cpp
View file

@ -156,7 +156,8 @@ int main(int argc, char *argv[])
delete splash;
delete mainWin;
unregisterFirmwares();
unregisterSimulators();
unregisterOpenTxFirmwares();
unregisterEEpromInterfaces();
#if defined(JOYSTICKS) || defined(SIMU_AUDIO)

7
companion/src/eeprominterface.cpp
View file

@ -1642,13 +1642,6 @@ QList<Firmware *> firmwares;
Firmware * default_firmware_variant;
Firmware * current_firmware_variant;
void unregisterFirmwares()
{
foreach (Firmware * f, firmwares) {
delete f;
}
}
void ShowEepromErrors(QWidget *parent, const QString &title, const QString &mainMessage, unsigned long errorsFound)
{
std::bitset<NUM_ERRORS> errors((unsigned long long)errorsFound);

2
companion/src/eeprominterface.h
View file

@ -1489,7 +1489,7 @@ inline void applyStickModeToModel(ModelData &model, unsigned int mode)
void registerEEpromInterfaces();
void unregisterEEpromInterfaces();
void registerOpenTxFirmwares();
void unregisterFirmwares();
void unregisterOpenTxFirmwares();
enum EepromLoadErrors {
NO_ERROR,

6
companion/src/firmwares/opentx/opentxinterface.cpp
View file

@ -1436,3 +1436,9 @@ void registerOpenTxFirmwares()
current_firmware_variant = default_firmware_variant;
}
void unregisterOpenTxFirmwares()
{
foreach (Firmware * f, firmwares) {
delete f;
}
}

1
companion/src/firmwares/opentx/opentxinterface.h
View file

@ -130,5 +130,6 @@ class OpenTxFirmware: public Firmware {
};
void registerOpenTxFirmwares();
void unregisterOpenTxFirmwares();
#endif

6
companion/src/simulation/simulatorinterface.cpp
View file

@ -81,3 +81,9 @@ SimulatorFactory *getSimulatorFactory(const QString &name)
return NULL;
}
void unregisterSimulators()
{
foreach(SimulatorFactory *factory, registered_simulators) {
delete factory;
}
}

1
companion/src/simulation/simulatorinterface.h
View file

@ -118,6 +118,7 @@ class SimulatorFactory {
};
void registerSimulators();
void unregisterSimulators();
SimulatorFactory *getSimulatorFactory(const QString &name);
extern QMap<QString, SimulatorFactory *> registered_simulators;

3
companion/src/simulator.cpp
View file

@ -176,6 +176,9 @@ int main(int argc, char *argv[])
delete dialog;
unregisterSimulators();
unregisterOpenTxFirmwares();
#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
SDL_Quit();
#endif