Fixed bug that caused incorrect scroll arrow to be displayed sometimes.

diff --git a/install.sh b/install.sh
index 52fab3dd8102fdc12f94621608e2590271361723..c70c80352bb1ee1dc5fd9fccf7e0e56afdfd3259 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -59,7 +59,6 @@ CheckForFiles() {
    else
       echo "The icons directory is missing! Aborting installation!"
    fi
-#|| ! -f $RefindDir/refind.conf-sample || ! -d $RefindDir/icons
 } # CheckForFiles()
 
 # Copy the rEFInd files to the ESP or OS X root partition.

diff --git a/mkdistrib b/mkdistrib
index f2444965690ab1cff7ba02417860f1088954b8d7..30c98255e053232f91e97911a329637899aa702a 100755 (executable)
--- a/mkdistrib
+++ b/mkdistrib
@@ -28,7 +28,7 @@ make
 mkdir -p refind-bin-$1/refind
 cp -a icons refind-bin-$1/refind/
 cp --preserve=timestamps refind.conf-sample refind-bin-$1/refind/
-cp refind/refind.efi refind-bin-$1/refind/refind_x64.efi
+cp refind/refind_x64.efi refind-bin-$1/refind/refind_x64.efi
 cp $StartDir/refind_ia32.efi refind-bin-$1/refind/
 cp -a COPYING.txt LICENSE.txt README.txt docs CREDITS.txt install.sh refind-bin-$1
 zip -9r ../refind-bin-$1.zip refind-bin-$1

diff --git a/refind/main.c b/refind/main.c
index 6256bbff984dd81da85e515e5373be06b2d4f5dc..150be7be8a9b8e80178a8f2379ee81c97d52ee68 100644 (file)
--- a/refind/main.c
+++ b/refind/main.c
@@ -104,7 +104,7 @@ static VOID AboutrEFInd(VOID)
 {
     if (AboutMenu.EntryCount == 0) {
         AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
-        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.3.4");
+        AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.3.4.1");
         AddMenuInfoLine(&AboutMenu, L"");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
         AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012 Roderick W. Smith");

diff --git a/refind/menu.c b/refind/menu.c
index 24b5526aad52dedf59e67171bc9aa31b26fdccdb..4b2b5fb5fdced9f7c4d272f72cf6c27dcfe706cf 100644 (file)
--- a/refind/menu.c
+++ b/refind/menu.c
@@ -813,7 +813,7 @@ static VOID PaintIcon(IN EG_EMBEDDED_IMAGE *BuiltInIcon, IN CHAR16 *ExternalFile
          PosX -= Icon->Width;
       BltImageAlpha(Icon, PosX, PosY - (Icon->Height / 2), &MenuBackgroundPixel);
    }
-} // static VOID PaintArrow()
+} // static VOID PaintIcon()
 
 // Display main menu in graphics mode
 VOID MainMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, IN UINTN Function, IN CHAR16 *ParamText)
@@ -886,7 +886,7 @@ VOID MainMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, IN UINT
                          row0PosY + (ROW0_TILESIZE / 2), ALIGN_RIGHT);
             } // if
             if ((State->LastVisible < (row0Loaders - 1)) && (!(GlobalConfig.HideUIFlags & HIDEUI_FLAG_ARROWS))) {
-               SPrint(FileName, 255, L"%s\\arrow_left.icns", GlobalConfig.IconsDir ? GlobalConfig.IconsDir : DEFAULT_ICONS_DIR);
+               SPrint(FileName, 255, L"%s\\arrow_right.icns", GlobalConfig.IconsDir ? GlobalConfig.IconsDir : DEFAULT_ICONS_DIR);
                PaintIcon(&egemb_arrow_right, FileName,
                          (UGAWidth + (ROW0_TILESIZE + TILE_XSPACING) * State->MaxVisible) / 2 + TILE_XSPACING,
                          row0PosY + (ROW0_TILESIZE / 2), ALIGN_LEFT);