-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp index bd07828..bf2c482 100644 --- a/noncore/settings/aqpkg/installdlgimpl.cpp +++ b/noncore/settings/aqpkg/installdlgimpl.cpp | |||
@@ -227,49 +227,50 @@ void InstallDlgImpl :: installSelected() | |||
227 | for ( it = updateList.begin() ; it != updateList.end() ; ++it ) | 227 | for ( it = updateList.begin() ; it != updateList.end() ; ++it ) |
228 | { | 228 | { |
229 | if ( it->option == "R" ) | 229 | if ( it->option == "R" ) |
230 | pIpkg->setOption( "reinstall" ); | 230 | pIpkg->setOption( "reinstall" ); |
231 | else | 231 | else |
232 | pIpkg->setOption( "upgrade" ); | 232 | pIpkg->setOption( "upgrade" ); |
233 | pIpkg->setDestination( it->destination->getDestinationName() ); | 233 | pIpkg->setDestination( it->destination->getDestinationName() ); |
234 | pIpkg->setDestinationDir( it->destination->getDestinationPath() ); | 234 | pIpkg->setDestinationDir( it->destination->getDestinationPath() ); |
235 | pIpkg->setPackage( it->packageName ); | 235 | pIpkg->setPackage( it->packageName ); |
236 | 236 | ||
237 | int tmpFlags = flags; | 237 | int tmpFlags = flags; |
238 | if ( it->destination->linkToRoot() && it->recreateLinks ) | 238 | if ( it->destination->linkToRoot() && it->recreateLinks ) |
239 | tmpFlags |= MAKE_LINKS; | 239 | tmpFlags |= MAKE_LINKS; |
240 | pIpkg->setFlags( tmpFlags ); | 240 | pIpkg->setFlags( tmpFlags ); |
241 | pIpkg->runIpkg(); | 241 | pIpkg->runIpkg(); |
242 | } | 242 | } |
243 | 243 | ||
244 | delete pIpkg; | 244 | delete pIpkg; |
245 | } | 245 | } |
246 | 246 | ||
247 | btnOptions->setEnabled( true ); | 247 | btnOptions->setEnabled( true ); |
248 | // btnInstall->setEnabled( true ); | 248 | // btnInstall->setEnabled( true ); |
249 | btnInstall->setText( tr( "Close" ) ); | 249 | btnInstall->setText( tr( "Close" ) ); |
250 | 250 | ||
251 | displayAvailableSpace( destination->currentText() ); | 251 | if ( destination->currentText() != 0 && destination->currentText() != "" ) |
252 | displayAvailableSpace( destination->currentText() ); | ||
252 | } | 253 | } |
253 | 254 | ||
254 | 255 | ||
255 | void InstallDlgImpl :: displayText(const QString &text ) | 256 | void InstallDlgImpl :: displayText(const QString &text ) |
256 | { | 257 | { |
257 | QString t = output->text() + "\n" + text; | 258 | QString t = output->text() + "\n" + text; |
258 | output->setText( t ); | 259 | output->setText( t ); |
259 | output->setCursorPosition( output->numLines(), 0 ); | 260 | output->setCursorPosition( output->numLines(), 0 ); |
260 | } | 261 | } |
261 | 262 | ||
262 | 263 | ||
263 | void InstallDlgImpl :: displayAvailableSpace( const QString &text ) | 264 | void InstallDlgImpl :: displayAvailableSpace( const QString &text ) |
264 | { | 265 | { |
265 | vector<Destination>::iterator d = dataMgr->getDestination( text ); | 266 | vector<Destination>::iterator d = dataMgr->getDestination( text ); |
266 | QString destDir = d->getDestinationPath(); | 267 | QString destDir = d->getDestinationPath(); |
267 | 268 | ||
268 | long blockSize = 0; | 269 | long blockSize = 0; |
269 | long totalBlocks = 0; | 270 | long totalBlocks = 0; |
270 | long availBlocks = 0; | 271 | long availBlocks = 0; |
271 | QString space; | 272 | QString space; |
272 | if ( Utils::getStorageSpace( (const char *)destDir, &blockSize, &totalBlocks, &availBlocks ) ) | 273 | if ( Utils::getStorageSpace( (const char *)destDir, &blockSize, &totalBlocks, &availBlocks ) ) |
273 | { | 274 | { |
274 | long mult = blockSize / 1024; | 275 | long mult = blockSize / 1024; |
275 | long div = 1024 / blockSize; | 276 | long div = 1024 / blockSize; |