diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb index 3a8a943..9d6c890 100644 --- a/MainWindow/MainWindowM.vb +++ b/MainWindow/MainWindowM.vb @@ -299,6 +299,7 @@ Public Class MainWindowM ' Info su opzioni chiave EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString()) EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir) + EgtPHOTOLib.MainData.SetDebugLevel(m_nDebug) EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel) EgtPHOTOLib.MainData.SetKeyOptions(CInt(m_nKeyOptions)) EgtPHOTOLib.MainData.SetPhotoDir(m_sPhotoDir) diff --git a/OptionPanel/RawPartTab/RawPartTabVM.vb b/OptionPanel/RawPartTab/RawPartTabVM.vb index 4a2adbf..d67f5fc 100644 --- a/OptionPanel/RawPartTab/RawPartTabVM.vb +++ b/OptionPanel/RawPartTab/RawPartTabVM.vb @@ -1093,7 +1093,10 @@ Public Class RawPartTabVM If OmagOFFICEMap.refMainWindowVM.MainWindowM.m_SlabDB Then ' Me.OmagPhoto = New OmagPhotoV(Application.Current.MainWindow()) Me.OmagPhoto = New OmagPhotoV - If Not PhotoMap.ContinueApplication Then End + If Not PhotoMap.ContinueApplication Then + EgtOutLog("Key protection denied to acces to DB photo, set configuration to image directory") + End + End If End If ' Aggiungo voci alla lista di tipi di definizione grezzo m_TypeList.Add(EgtMsg(MSG_RAWPARTPAGEUC + 1)) @@ -2271,10 +2274,9 @@ Public Class RawPartTabVM m_RefreshTimer.Interval = TimeSpan.FromMilliseconds(2000) m_RefreshTimer.Start() - '' apro la finestra per accedere al DB delle lastre - 'Me.OmagPhoto = New OmagPhotoV(Application.Current.MainWindow) + ' apro la finestra per accedere al DB delle lastre (Devo crea una nuova istanza perchè la chiusura elimina la stessa) + Me.OmagPhoto = New OmagPhotoV Me.OmagPhoto.ShowDialog() - m_RefreshTimer.Stop() EgtSetCurrentContext(EgtPHOTOLib.MainData.PreviousContext)