Corrections and improvements for #73

JAM-Software · Oct 26, 2017 · cb23eaf · cb23eaf
1 parent 106602e
commit cb23eaf
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Lib/UIRibbon.Register.pas b/Lib/UIRibbon.Register.pas
@@ -21,7 +21,8 @@ implementation
 
 uses
   Classes, UIRibbon, SysUtils, UIRibbonActions, System.Actions, System.Win.Registry,
-  Winapi.ShellAPI, Winapi.Windows, UIRibbonUtils, ToolsApi, Vcl.Dialogs;
+  Winapi.ShellAPI, Winapi.Windows, UIRibbonUtils, ToolsApi, Vcl.Dialogs,
+  System.IOUtils;
 
 procedure Register;
 var
@@ -92,10 +93,12 @@ procedure TMyRibbonFrameworkEditor.ExecuteVerb(pIndex: Integer);
 begin
   inherited;
   lRibbon := (Self.Component as TUiRibbon);
-  if lRibbon.RibbonSourceFile.IsEmpty or not FileExists(lRibbon.RibbonSourceFile) then
+  if lRibbon.RibbonSourceFile.IsEmpty or
+     not FileExists(TPath.Combine(ExtractFilePath(getActiveProject.FileName), lRibbon.RibbonSourceFile))
+  then
     lRibbon.RibbonSourceFile := BrowseForXmlFile();
   case pIndex of
-    0: ShellExecute(0, 'open', PChar(GetDesignerPath()), PChar('"'+lRibbon.RibbonSourceFile+'"'), nil, SW_SHOWNORMAL);
+    0: ShellExecute(0, 'open', PChar(GetDesignerPath()), PChar('"'+ TPath.Combine(ExtractFilePath(getActiveProject.FileName), lRibbon.RibbonSourceFile) +'"'), nil, SW_SHOWNORMAL);
   end;
 end;