Mercurial > hg > sonic-visualiser
comparison main/main.cpp @ 578:31940304272f with-dependencies
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Thu, 16 May 2013 14:35:31 +0100 |
| parents | bf1c6e2b8791 0b094b0fdcc4 |
| children | 7a6fd7150f2d |
comparison
equal
deleted
inserted
replaced
| 568:96a0e169b70f | 578:31940304272f |
|---|---|
| 443 settings.endGroup(); | 443 settings.endGroup(); |
| 444 #endif | 444 #endif |
| 445 | 445 |
| 446 delete gui; | 446 delete gui; |
| 447 | 447 |
| 448 cleanupMutex.unlock(); | |
| 449 | |
| 448 return rv; | 450 return rv; |
| 449 } | 451 } |
| 450 | 452 |
| 451 bool SVApplication::event(QEvent *event){ | 453 bool SVApplication::event(QEvent *event){ |
| 452 QString thePath; | 454 QString thePath; |