From eff1f7ca100c88f6021385122c5bf903e9d4ace8 Mon Sep 17 00:00:00 2001
From: Christopher Goes <cwgoes@pluranimity.org>
Date: Wed, 16 Jan 2019 15:59:19 +0100
Subject: [PATCH] Merge PR #3304: Non-zero-height export fix

* Tiny non-zero-height export fix
* Fix linter
---
 cmd/gaia/cmd/gaiad/main.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmd/gaia/cmd/gaiad/main.go b/cmd/gaia/cmd/gaiad/main.go
index 6d597eed7..6cb2d4eeb 100644
--- a/cmd/gaia/cmd/gaiad/main.go
+++ b/cmd/gaia/cmd/gaiad/main.go
@@ -65,12 +65,14 @@ func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer) abci.Application
 func exportAppStateAndTMValidators(
 	logger log.Logger, db dbm.DB, traceStore io.Writer, height int64, forZeroHeight bool,
 ) (json.RawMessage, []tmtypes.GenesisValidator, error) {
-	gApp := app.NewGaiaApp(logger, db, traceStore, false)
 	if height != -1 {
+		gApp := app.NewGaiaApp(logger, db, traceStore, false)
 		err := gApp.LoadHeight(height)
 		if err != nil {
 			return nil, nil, err
 		}
+		return gApp.ExportAppStateAndValidators(forZeroHeight)
 	}
+	gApp := app.NewGaiaApp(logger, db, traceStore, true)
 	return gApp.ExportAppStateAndValidators(forZeroHeight)
 }