fixed callback not released + unneded env func param

This commit is contained in:
Hane 2025-01-16 18:09:02 +01:00
commit a3d00be3fe
5 changed files with 8 additions and 4 deletions

View file

@ -741,7 +741,7 @@ wchar_t* Environment::getExeAbsPath(uint32_t *exeAbsPathLength) {
return exeAbsPath; return exeAbsPath;
} }
std::string Environment::createSettingsPath(SettingsTargetDirectory target, bool create) { std::string Environment::createSettingsPath(SettingsTargetDirectory target) {
wchar_t* settingsPath = nullptr; wchar_t* settingsPath = nullptr;
wchar_t settingsFile[] = L"\\settings.ini"; wchar_t settingsFile[] = L"\\settings.ini";
uint32_t settingsFileLen = (sizeof(settingsFile) / sizeof(wchar_t)) - 1; uint32_t settingsFileLen = (sizeof(settingsFile) / sizeof(wchar_t)) - 1;

View file

@ -211,7 +211,7 @@ class EndpointNewSessionCallback : public IAudioSessionNotification {
namespace Environment { namespace Environment {
wchar_t* getExeAbsPath(uint32_t *exeAbsPathLength); wchar_t* getExeAbsPath(uint32_t *exeAbsPathLength);
std::string createSettingsPath(SettingsTargetDirectory target, bool create); std::string createSettingsPath(SettingsTargetDirectory target);
void populateSystemValues(); void populateSystemValues();
void openControlPanel(); void openControlPanel();
ProcessedNativeEvent processTopLevelWindowMessage(void* msg); ProcessedNativeEvent processTopLevelWindowMessage(void* msg);

View file

@ -3,7 +3,7 @@
void setConfigDirToDefaults() { void setConfigDirToDefaults() {
#define tryFileDir(dir, create) do { \ #define tryFileDir(dir, create) do { \
OverseerHandler::settingsPath = Environment::createSettingsPath(dir, create); \ OverseerHandler::settingsPath = Environment::createSettingsPath(dir); \
set = ini::UserSettings::createSettings(OverseerHandler::settingsPath.c_str(), create); \ set = ini::UserSettings::createSettings(OverseerHandler::settingsPath.c_str(), create); \
if(set) { \ if(set) { \
return; \ return; \

View file

@ -85,3 +85,7 @@ void SessionHandler::reviseSessionShowing(SessionState state) {
} }
} }
SessionHandler::~SessionHandler() {
session->removeStateCallback(ssc);
ssc->Release();
}

View file

@ -33,7 +33,7 @@ class SessionHandler {
void setName(std::wstring newName); void setName(std::wstring newName);
void reviseSessionShowing(SessionState state); void reviseSessionShowing(SessionState state);
SessionVolumeInfo* getVolumeInfo(); SessionVolumeInfo* getVolumeInfo();
~SessionHandler();
private: private:
SessionVolumeInfo svi; SessionVolumeInfo svi;
EndpointHandler* eph; EndpointHandler* eph;