i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unprotected MultiAudioDevice destructor.

Browse Source 
Now deletes MultiAudioDevices which don't init correctly.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8663 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2004-08-26 14:01:39 +00:00
parent 42a266345e
commit dcda1706fa
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp
+6 -2
View File
@@ -235,8 +235,12 @@ MultiAudioAddOn::RecursiveScan(char* rootPath, BEntry *rootEntry = NULL)
BPath path; BPath path;
entry.GetPath(&path); entry.GetPath(&path);
MultiAudioDevice *device = new MultiAudioDevice(path.Path() + strlen(rootPath), path.Path()); MultiAudioDevice *device = new MultiAudioDevice(path.Path() + strlen(rootPath), path.Path());
if(device && device->InitCheck() == B_OK) if (device) {
fDevices.AddItem(device); if (device->InitCheck() == B_OK)
fDevices.AddItem(device);
else
delete device;
}
} }
} }
src/add-ons/media/media-add-ons/multi_audio/MultiAudioDevice.h
+1 -3
View File
@@ -36,11 +36,9 @@
class MultiAudioDevice class MultiAudioDevice
{ {
protected:
virtual ~MultiAudioDevice(void);
public: public:
explicit MultiAudioDevice(const char *name, const char* path); explicit MultiAudioDevice(const char *name, const char* path);
virtual ~MultiAudioDevice(void);
virtual status_t InitCheck(void) const; virtual status_t InitCheck(void) const;