Mercurial > ecos
comparison host/tools/configtool/common/win32/CTCommonDoc.cpp @ 107:7f461c3a372c
Merge from eCos master repository on 2000-07-04-08:04:30-BST
| author | jlarmour |
|---|---|
| date | Tue, 04 Jul 2000 07:34:17 +0000 |
| parents | 95f3e12a6327 |
| children | 74dbf4c3f2e1 |
comparison
equal
deleted
inserted
replaced
| 106:78839af9144f | 107:7f461c3a372c |
|---|---|
| 942 if (! bNowLoaded && bPreviouslyLoaded){ | 942 if (! bNowLoaded && bPreviouslyLoaded){ |
| 943 // The package was loaded but should now be unloaded: | 943 // The package was loaded but should now be unloaded: |
| 944 bChanged|=pItem->Unload(); | 944 bChanged|=pItem->Unload(); |
| 945 } else if (bNowLoaded) {// if the package should be loaded | 945 } else if (bNowLoaded) {// if the package should be loaded |
| 946 const CString strVersion(dlg.GetVersion (strPackageName)); | 946 const CString strVersion(dlg.GetVersion (strPackageName)); |
| 947 if (bPreviouslyLoaded) { // if the package is not already loaded | 947 if (bPreviouslyLoaded) { // if the package is already loaded |
| 948 CdlTransactionCallback::set_callback_fn (NULL); // avoid value refresh attempts during load/unload | |
| 948 bChanged|=pItem->ChangeVersion(strVersion); | 949 bChanged|=pItem->ChangeVersion(strVersion); |
| 950 CdlTransactionCallback::set_callback_fn (CdlTransactionHandler); // restore value refresh | |
| 949 } else { | 951 } else { |
| 950 // the package was not loaded but should now be loaded | 952 // the package was not loaded but should now be loaded |
| 951 TRACE (_T("Loading package %s\n"), strMacroName); | 953 TRACE (_T("Loading package %s\n"), strMacroName); |
| 952 try | 954 try |
| 953 { | 955 { |
