From b23c9289221fb27f868dcf962d8afe5d3cf75589 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sat, 14 Mar 2009 18:10:44 +1100
Subject: [PATCH] Don't source the user RC file twice when 'exrc' is set.

When started from $HOME, the 'exrc' file and the user RC file are the
same file.
---
 common/content/liberator.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/content/liberator.js b/common/content/liberator.js
index 19fe896f..c0798fae 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -1291,12 +1291,12 @@ const liberator = (function () //{{{
             setTimeout(function () {
 
                 let init = services.get("environment").get(config.name.toUpperCase() + "_INIT");
+                let rcFile = io.getRCFile("~");
+
                 if (init)
                     liberator.execute(init);
                 else
                 {
-                    let rcFile = io.getRCFile("~");
-
                     if (rcFile)
                         io.source(rcFile.path, true);
                     else
@@ -1306,7 +1306,7 @@ const liberator = (function () //{{{
                 if (options["exrc"])
                 {
                     let localRCFile = io.getRCFile(io.getCurrentDirectory().path);
-                    if (localRCFile)
+                    if (localRCFile && !localRCFile.equals(rcFile))
                         io.source(localRCFile.path, true);
                 }